added some windows/cmd.exe stuff

diff --git a/test/Makefile b/test/Makefile
index 65df4da4c999ea8d56ded73ec7ad5675c6d087de..d71d5fda4279e2d1b4bfd962c05eedf55ff275f6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,10 +6,10 @@ MAKE := make --no-print-dir
 .PHONY: all clean
 
 all:
-       @$(MAKE) -C val all
-       @$(MAKE) -C ref all
-       @$(MAKE) -C err all
-       @$(MAKE) -C misc all
+       @$(MAKE) -C val clean all
+       @$(MAKE) -C ref clean all
+       @$(MAKE) -C err clean all
+       @$(MAKE) -C misc clean all
 
 clean:
        @$(MAKE) -C val clean

diff --git a/test/err/Makefile b/test/err/Makefile
index 6f919b3d136a73287b7fa8b4f08be40cc759e462..3ced60bc89ad35c873c01885da966db7a42209a6 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -1,14 +1,21 @@
 
 # makefile for the tests that MUST NOT compile
 
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
 CC65FLAGS = -t sim6502
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
-SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
 
+ifdef CMD_EXE
+RM := del /f
+else
 RM := rm -f
+endif
 
-.PHONY: all
+.PHONY: all clean
 
 TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
 TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index 02f264cc61594b1a484837ddd6448a07a7e1013e..b9e4637d0da518bcf08a9168dd131b22453d9936 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -1,14 +1,25 @@
 
+# makefile for the remaining tests that need special care in one way or another
+
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
 CC65FLAGS = -t sim6502
 SIM65FLAGS = -x 200000000
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
 
+ifdef CMD_EXE
+RM := del /f
+DIFF := fc
+else
 RM := rm -f
 DIFF := diff -q
+endif
 
-.PHONY: all
+.PHONY: all clean
 
 TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
 TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))

diff --git a/test/readme.txt b/test/readme.txt
index 308b2fa90a327d0a9cb64636da85ca407b8290fd..673ecabdbcf6ceb668a896875fe520cf4d0a7687 100644 (file)
--- a/test/readme.txt
+++ b/test/readme.txt
@@ -12,5 +12,5 @@ compiler.
 /misc - a few tests that need special care of some sort
 
 
-to run the tests use "make clean all" in this (top) directory, the makefile
-should exit with no error.
+to run the tests use "make" in this (top) directory, the makefile should exit
+with no error.

diff --git a/test/ref/Makefile b/test/ref/Makefile
index 88d54a29654e315bea072efb5b804c7b2abfa8ea..b3b555aefa117461d6fad87e160de53fb478eddc 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -2,18 +2,27 @@
 # makefile for the regression tests that generate output which has to be
 # compared with reference output
 
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
 CC65FLAGS = -t sim6502
 SIM65FLAGS = -x 200000000
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
 
+ifdef CMD_EXE
+RM := del /f
+DIFF := fc
+else
 RM := rm -f
 DIFF := diff -q
+endif
 
 CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow
 
-.PHONY: all
+.PHONY: all clean
 
 REFS := $(patsubst %.c,%.ref,$(wildcard *.c))
 

diff --git a/test/todo b/test/todo
index 911eacdd36595d1eb2c5081efbb7cdf6df412c22..75245507e89c1fc38495d67550822e4460875d04 100644 (file)
--- a/test/todo
+++ b/test/todo
@@ -1,10 +1,4 @@
 
-- the tests in ./misc need special care
-
 - check all tests in ./ref and make them return their results as exit code
 
-- in ./val use some other tool than "diff" for comparing the results
-
-- fixup makefiles to use "del" instead of "rm -f" on windows
-
 - reduce usage of "common.h" to a minimum

diff --git a/test/val/Makefile b/test/val/Makefile
index 0e4a6e94cf277cdad760595c5bbe6aecee6765b0..e4841bd35a02872d3e600d7361dfa345af1ea8a6 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -1,15 +1,23 @@
 
 # makefile for the regression tests that return an error code on failure
 
+ifneq ($(shell echo),)
+  CMD_EXE = 1
+endif
+
 CC65FLAGS = -t sim6502
 SIM65FLAGS = -x 200000000
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
 
+ifdef CMD_EXE
+RM := del /f
+else
 RM := rm -f
+endif
 
-.PHONY: all
+.PHONY: all clean
 
 TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
 TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))