screened 2024-05-18 13:14:30+00:00

bfrk · May 18, 2024 · 1986047 · 1986047
1 parent a640c53
commit 1986047
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -14,7 +14,7 @@ jobs:
 #          - ubuntu-22.04
 #           - macos-11
 #           - macos-12
-#          - macos-13
+          - macos-13
 #           - windows-2019
           - windows-2022
         ghc:
@@ -32,7 +32,7 @@ jobs:
     env:
       builddocs: ${{ matrix.ghc == '9.4.5' }}
       runtests: ${{ matrix.ghc == '8.4.4' || matrix.ghc == '9.6.4' }}
-      tests-to-run: -t=issue1465_ortryrunning -t=issue2333
+      tests-to-run: -t=issue1465_ortryrunning -t=issue2333 -t=EXAMPLE
       testcmd: cabal run -- darcs-test -f=2
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       # avoid occasional timeouts in test scripts that access darcs.net:

diff --git a/tests/EXAMPLE.sh b/tests/EXAMPLE.sh
@@ -36,7 +36,9 @@ cd R
 # change the working tree
 mkdir d e
 echo 'Example content.' > d/f
-darcs record -lam 'Add d/f and e.' --debug 2>../RLOG
+echo "content of _darcs/rebase:" >&2
+cat _darcs/rebase >&2
+darcs record -lam 'Add d/f and e.' --debug
 darcs mv d/f e/
 darcs record -am 'Move d/f to e/f.'
 # push patches from R to S

diff --git a/tests/issue1465_ortryrunning.sh b/tests/issue1465_ortryrunning.sh
@@ -66,17 +66,17 @@ darcs changes   > changes-1
 darcs unrecord  -a
 grep fake changes-1
 
-# on macOS running darcs in this way fails
-if ! (echo $DARCSDIR | grep -q osx) then
+# # on macOS running darcs in this way fails
+# if ! (echo $DARCSDIR | grep -q osx) then
 # Bad editor: fall through to the next choice
 DARCS_EDITOR=$FAKE_EDITOR_HOME/editor-bad \
-PATH=.:$DARCSDIR \
+PATH=.:$DARCSDIR:$PATH \
 darcs record    -lam 'Initial commit.' --edit </dev/null &> log-2
 darcs changes   > changes-2
 darcs unrecord  -a
 grep "Initial" changes-2
 egrep -i 'vi|emacs|nano|edit' log-2
-fi
+# fi
 
 # Normal failure (eg. user hit ^-C)
 # If Darcs did the right thing, the output won't make any mention of

diff --git a/tests/lib b/tests/lib
@@ -24,11 +24,6 @@ if os_is_windows; then
 fi
 }
 
-# trick: OS-detection (if needed)
-os_is_macos() {
-  echo $OS | grep -i mac
-}
-
 if os_is_windows; then
   # some installations of bash on Windows do not include \r by default
   # which breaks a lot of tests