Made test Makefiles work with CMD.EXE

diff --git a/test/Makefile b/test/Makefile
index 27f7ff45636be467e35ef75a27f2f6803d806773..ddeccc5eeae3a9d0ff7a8be20a6199438ca9c8b3 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,25 +10,27 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
-  RM := del /f
   EXE := .exe
-  MKDIR := mkdir
-  RMDIR := rmdir
+  RM = del /f $(subst /,\,$1)
+  MKDIR = mkdir $(subst /,\,$1)
+  RMDIR = rmdir /s /q $(subst /,\,$1)
 else
-  RM := rm -f
   EXE :=
-  MKDIR := mkdir -p
-  RMDIR := rmdir
+  RM = $(RM) $1
+  MKDIR = mkdir $1
+  RMDIR = rmdir $1
 endif
 
 WORKDIR := ../testwrk
 
+CC := gcc
+
 .PHONY: all dotests continue mostly-clean clean
 
 all: dotests
 
 $(WORKDIR):
-       $(MKDIR) $(WORKDIR)
+       $(call MKDIR,$(WORKDIR))
 
 $(WORKDIR)/bdiff$(EXE): bdiff.c | $(WORKDIR)
        $(CC) -O2 -o $@ $<
@@ -50,5 +52,5 @@ mostly-clean:
        @$(MAKE) -C misc clean
 
 clean: mostly-clean
-       $(RM) $(WORKDIR)/bdiff$(EXE)
-       $(RMDIR) $(WORKDIR)
+       -@$(call RM,$(WORKDIR)/bdiff$(EXE))
+       -$(call RMDIR,$(WORKDIR))

diff --git a/test/err/Makefile b/test/err/Makefile
index 4e12323fdb188389af17a52835a5e94e1e1a1661..d729784278e1b649782a1175aa5337657088a0e8 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -5,16 +5,18 @@ ifneq ($(shell echo),)
   CMD_EXE := 1
 endif
 
-CC65FLAGS := -t sim6502
-
-CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
-
 ifdef CMD_EXE
-RM := del /f
+  NOT := - # Hack
+  RM = del /f $(subst /,\,$1)
 else
-RM := rm -f
+  NOT := !
+  RM = $(RM) $1
 endif
 
+CC65FLAGS := -t sim6502
+
+CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+
 WORKDIR := ../../testwrk
 
 .PHONY: all clean
@@ -25,22 +27,22 @@ TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=
 all: $(TESTS)
 
 $(WORKDIR)/%.prg: %.c
-       ! $(CL65) $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.o.prg: %.c
-       ! $(CL65) -O $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -O $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.os.prg: %.c
-       ! $(CL65) -Os $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Os $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.osi.prg: %.c
-       ! $(CL65) -Osi $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Osi $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.osir.prg: %.c
-       ! $(CL65) -Osir $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Osir $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.oi.prg: %.c
-       ! $(CL65) -Oi $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Oi $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.oir.prg: %.c
-       ! $(CL65) -Oir $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Oir $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.or.prg: %.c
-       ! $(CL65) -Or $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
+       -@$(call RM,$(TESTS))
+       -@$(call RM,$(SOURCES:.c=.o))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index b04321c337ce17b99237fc04a4a0c2786642b54d..a1b1d72ca6e2fe9051c819c2b4246bf7d58896e3 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -5,20 +5,23 @@ 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
+  S := $(subst /,\,/)
+  NOT := - # Hack
+  RM = del /f $(subst /,\,$1)
 else
-RM := rm -f
+  S := /
+  NOT := !
+  RM = $(RM) $1
 endif
 
-WORKDIR := ../../testwrk
+CC65FLAGS := -t sim6502
+SIM65FLAGS := -x 200000000
+
+CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
 
+WORKDIR := ..$S..$Stestwrk
 DIFF := $(WORKDIR)/bdiff
 
 .PHONY: all clean
@@ -31,7 +34,7 @@ all: $(TESTS)
 # should compile, but then hangs in an endless loop
 $(WORKDIR)/endless%prg: endless.c
        $(CL65) $(subst .,,$(*:.o%=-O%)) $(CC65FLAGS) $< -o $@
-       ! $(SIM65) $(SIM65FLAGS) $@
+       $(NOT) $(SIM65) $(SIM65FLAGS) $@
 
 # these need reference data that can't be generated by a host-compiled program,
 # in a useful way
@@ -51,6 +54,6 @@ $(WORKDIR)/sitest%prg: sitest.c
 #      -$(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
-       @$(RM) $(SOURCES:%.c=$(WORKDIR)/%.out)
+       -@$(call RM,$(TESTS))
+       -@$(call RM,$(SOURCES:.c=.o))
+       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.out))

diff --git a/test/ref/Makefile b/test/ref/Makefile
index dbe0b0f75dde729154c3963fbf17c2db5ba6425f..4d67350997d154379cc6d03bf6a95f520eed3cd9 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -6,22 +6,24 @@ 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
+  S := $(subst /,\,/)
+  RM = del /f $(subst /,\,$1)
 else
-RM := rm -f
+  S := /
+  RM = $(RM) $1
 endif
 
-WORKDIR := ../../testwrk
+CC65FLAGS := -t sim6502
+SIM65FLAGS := -x 200000000
+
+CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
 
+WORKDIR := ..$S..$Stestwrk
 DIFF := $(WORKDIR)/bdiff
 
+CC := gcc
 CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow
 
 .PHONY: all clean
@@ -34,7 +36,7 @@ all: $(REFS) $(TESTS)
 
 $(WORKDIR)/%.ref: %.c
        $(CC) $(CFLAGS) $< -o $(WORKDIR)/$*.host
-       $(WORKDIR)/$*.host > $@
+       $(WORKDIR)$S$*.host > $@
 
 # Some files have "K & R"-style syntax.  Therefore, some forward
 # function-declarations don't match the later function definitions.
@@ -91,8 +93,8 @@ $(WORKDIR)/%.or.prg: %.c $(WORKDIR)/%.ref
        $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
-       @$(RM) $(SOURCES:%.c=$(WORKDIR)/%.out)
-       @$(RM) $(SOURCES:%.c=$(WORKDIR)/%.ref)
-       @$(RM) $(SOURCES:%.c=$(WORKDIR)/%.host)
+       -@$(call RM,$(TESTS))
+       -@$(call RM,$(SOURCES:.c=.o))
+       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.out))
+       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.ref))
+       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.host))

diff --git a/test/val/Makefile b/test/val/Makefile
index b2a2481b4125c99224dda8eb0f8648062174506e..4392fa3231296780a7bb0b779da54f431d44a6f4 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -5,18 +5,18 @@ ifneq ($(shell echo),)
   CMD_EXE := 1
 endif
 
+ifdef CMD_EXE
+  RM = del /f $(subst /,\,$1)
+else
+  RM = $(RM) $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
-
 WORKDIR := ../../testwrk
 
 .PHONY: all clean
@@ -66,5 +66,5 @@ $(WORKDIR)/%.or.prg: %.c
        $(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
+       -@$(call RM,$(TESTS))
+       -@$(call RM,$(SOURCES:.c=.o))