Improve DOS testing

thetic · thetic · commit 4293a4cfc376 · 2022-12-11T16:13:32.000-08:00
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -420,27 +420,22 @@ jobs:
   make_dos:
     name: Make OpenWatcom DOS
     runs-on: ubuntu-latest
+    env:
+      WATCOM: "./watcom"
     steps:
       - name: Checkout
         uses: actions/checkout@main
       - name: Install tools
         run: |
           sudo apt-get install -y dosbox
-          git clone https://github.com/cpputest/watcom-compiler.git watcom
-          echo "WATCOM=$GITHUB_WORKSPACE/watcom" >> $GITHUB_ENV
-          echo "CC=wcl" >> $GITHUB_ENV
-          echo "CXX=wcl" >> $GITHUB_ENV
-          echo "$GITHUB_WORKSPACE/watcom/binl" >> $GITHUB_PATH
-          echo "CPPUTEST_HOME=$GITHUB_WORKSPACE" >> $GITHUB_ENV
+          git clone https://github.com/cpputest/watcom-compiler.git $WATCOM
+          echo "$WATCOM/binl" >> $GITHUB_PATH
       - name: Build
-        run: |
-          $CC --version
-          make -f $CPPUTEST_HOME/platforms/Dos/Makefile clean
-          make -f $CPPUTEST_HOME/platforms/Dos/Makefile
+        run: make -f platforms/Dos/Makefile
       - name: Test
         env:
           TERM: linux
-        run: $CPPUTEST_HOME/platforms/Dos/alltests.sh
+        run: platforms/Dos/alltests.sh
 
   cmake_msys:
     name: CMake MSYS
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,6 @@ generated/
 *.LIB
 *.LST
 *.EXE
+*.LOG
+/console_output
+/exit
diff --git a/platforms/Dos/alltests.sh b/platforms/Dos/alltests.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+: "${CPPUTEST_HOME:=.}"
+
 checkForCppUTestToolsEnvVariable() {
 	if [ -z "$CPPUTEST_HOME" ] ; then
 	   echo "CPPUTEST_HOME not set. You must set CPPUTEST_HOME to the top level CppUTest directory"

-Original file line number
+Diff line change
 *.LIB
 *.LST
 *.EXE
 +*.LOG
 +/console_output
 +/exit