Drive dosbox tests from make

GeorgPessler · Dec 12, 2022 · dc7c799 · dc7c799
1 parent 4293a4c
commit dc7c799
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -422,6 +422,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       WATCOM: "./watcom"
+      TERM: linux
     steps:
       - name: Checkout
         uses: actions/checkout@main
@@ -433,9 +434,7 @@ jobs:
       - name: Build
         run: make -f platforms/Dos/Makefile
       - name: Test
-        env:
-          TERM: linux
-        run: platforms/Dos/alltests.sh
+        run: make -f platforms/Dos/Makefile test
 
   cmake_msys:
     name: CMake MSYS

diff --git a/platforms/Dos/Makefile b/platforms/Dos/Makefile
@@ -9,7 +9,7 @@ comma := ,
 path_separator := /
 drive = $(subst $(CYGDRIVE),$(lastword $(subst /, ,$(CYGDRIVE))):/,$(1))
 convert_paths = $(if $(CYGDRIVE),$(subst /,$(path_separator),$(call drive,$(1))),$(1))
-CPPUTEST_HOME ?= .
+export CPPUTEST_HOME ?= .
 
 -include $(CPPUTEST_HOME)/platforms/Dos/platform.mk
 include $(CPPUTEST_HOME)/platforms/Dos/sources.mk
@@ -63,3 +63,7 @@ clean:
 %.EXE: $$($$*_OBJECTS) | CPPU.LIB CPPUX.LIB
 	$(LINK) opt q,map,st=50k sys dos lib CPPU.LIB,CPPUX.LIB \
     file $(subst $(space),$(comma),$(call convert_paths,$?)) name $@
+
+.PHONY:
+test:
+	$(CPPUTEST_HOME)/platforms/Dos/alltests.sh