More work on the OS X runner config. Install gnu sed and use that,

now the test scripts work.

Author: R. van Elst

.github/workflows/build-test-and-artifact.yml

@@ -134,15 +134,12 @@ jobs:
       run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Install dependencies
-      run: brew install coreutils libpcap netcat # sdl2 libx11
-
-    - name: gnu tr
-      run: sudo mv /usr/local/opt/coreutils/libexec/gnubin/tr /usr/bin/tr
+      run: brew install libpcap netcat gnu-sed # sdl2 libx11 / sdl doesnt work see #44
 
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Wall -Wc++11-extensions -Wc++11-long-long -Wc++11-extra-semi -std=c++11 -stdlib=libc++ -I/usr/local/opt/libpcap/include"
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Wall -std=c++11 -stdlib=libc++ -I/usr/local/opt/libpcap/include"
 
     - name: Build
       working-directory: ${{runner.workspace}}/build
@@ -151,10 +148,15 @@ jobs:
       env:
         MAKEFLAGS: "-j2"
 
+    - name: Run test scripts
+      working-directory: ${{runner.workspace}}/axpbox
+      shell: bash
+      run: ${{runner.workspace}}/axpbox/test/run
+
     - name: Upload AXPbox Binary
       uses: actions/upload-artifact@v1
       with:
-        name: AXPbox-osx-appleclang-${{ env.BUILD_DATE }}
+        name: AXPbox-osx-10.15-appleclang-${{ env.BUILD_DATE }}
         path: ${{runner.workspace}}/build/axpbox 
       env:
         BUILD_DATE: ${{ steps.date.outputs.date }} 

test/disk/unwritable/test.sh

@@ -20,8 +20,13 @@ fi
 chmod 700 disk-unwritable.img
 rm disk-unwritable.img
 
-sed -i -e 's$/[^ ]*/DiskFile.cpp$DiskFile.cpp$g' \
-    -e 's/line [0-9]*/line L/g' -e '/$Id/d' axp.log
+# OS X github runner has weiro sed version, use gnu one there.
+SED=/usr/bin/sed
+if [[ -f "/usr/local/opt/gnu-sed/libexec/gnubin/sed" ]]; then
+  SED=/usr/local/opt/gnu-sed/libexec/gnubin/sed
+fi
+
+${SED} -i -e 's$/[^ ]*/DiskFile.cpp$DiskFile.cpp$g' -e 's/line [0-9]*/line L/g' -e '/$Id/d' axp.log
 
 echo -n -e '\033[1;31m'
 diff -c axp_correct.log axp.log && echo -e '\033[1;32mdiff clean\033[0m'

test/rom/test.sh

@@ -16,14 +16,14 @@ else # Travis
 fi
 
 # Wait for AXPbox to start
-sleep 3
+sleep 5
 
 # Connect to terminal
 nc -t 127.0.0.1 21000 | tee axp.log &
 NETCAT_PID=$!
 
 # Wait for the last line of log to become P00>>>
-timeout=300
+timeout=100
 while true
 do
   if [ $timeout -eq 0 ]
@@ -32,7 +32,8 @@ do
     exit 1
   fi
 
-  if [ "$(tail -n 1 axp.log | LC_ALL=C tr -d '\0')" == "P00>>>"  ]
+  # print last line and remove null byte from it
+  if [ "$(LC_ALL=C sed -n '$p' axp.log | LC_ALL=C sed 's/\x00//g')" == "P00>>>"  ]
   then
     echo
     break