use testwrk for binaries, and generated reference data

diff --git a/test/Makefile b/test/Makefile
index be0360c41275eac9bf90986da9030eed4cc52e10..8429852332df63f39d2aa8d1e98db6e7e669d8a6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -11,10 +11,12 @@ ifdef CMD_EXE
   RM := del /f
   EXE := .exe
   MKDIR = mkdir
+  RMDIR = rmdir
 else
   RM := rm -f
   EXE :=
   MKDIR = mkdir -p
+  RMDIR = rmdir
 endif
 
 WORKDIR := ../testwrk
@@ -41,3 +43,4 @@ clean:
        @$(MAKE) -C err clean
        @$(MAKE) -C misc clean
        @$(RM) $(WORKDIR)/bdiff$(EXE)
+       @$(RMDIR) $(WORKDIR)

diff --git a/test/err/Makefile b/test/err/Makefile
index fd18bf7524086f8c1e72d4e9685ba388c5f79b6d..f7f41a03ccc7a82aa8fc0a73ba2924dc6829b6f9 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -19,33 +19,33 @@ WORKDIR := ./../../testwrk
 
 .PHONY: all clean
 
-TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.os.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.or.prg,$(wildcard *.c))
+TESTS := $(patsubst %.c,$(WORKDIR)/%.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.o.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.os.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.or.prg,$(wildcard *.c))
 
 all: $(TESTS)
 
-%.prg: %.c
+$(WORKDIR)/%.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.o.prg: %.c
+$(WORKDIR)/%.o.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.os.prg: %.c
+$(WORKDIR)/%.os.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.osi.prg: %.c
+$(WORKDIR)/%.osi.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.osir.prg: %.c
+$(WORKDIR)/%.osir.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.oi.prg: %.c
+$(WORKDIR)/%.oi.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.oir.prg: %.c
+$(WORKDIR)/%.oir.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
-%.or.prg: %.c
+$(WORKDIR)/%.or.prg: %.c
        ! $(CL65) $(CC65FLAGS) $< -o $@
 clean:
-       @$(RM) *.o
-       @$(RM) *.prg
+       @$(RM) $(TESTS)
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.o,$(wildcard *.c))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index 43cb6f5769db2c79d6842bc5abb7a783678154ed..ce1956d861d2a3e70f2d397aa1cb0bd1bb1c204e 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -23,41 +23,42 @@ DIFF := $(WORKDIR)/bdiff
 
 .PHONY: all clean
 
-TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.os.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.or.prg,$(wildcard *.c))
+TESTS := $(patsubst %.c,$(WORKDIR)/%.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.o.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.os.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.or.prg,$(wildcard *.c))
 
 all: $(TESTS)
 
 # should compile, but then hangs in an endless loop
-endless%prg: endless.c
+$(WORKDIR)/endless%prg: endless.c
        $(CL65) $(CC65FLAGS) $< -o $@
        ! $(SIM65) $(SIM65FLAGS) $@
 
 # these need reference data that cant be generated by a host compiled program
 # in a useful way
-limits%prg: limits.c
+$(WORKDIR)/limits%prg: limits.c
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > limits.out
-       $(DIFF) limits.out limits.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/limits.out
+       $(DIFF) $(WORKDIR)/limits.out limits.ref
 
 # the rest are tests that fail currently for one reason or another
-fields%prg: fields.c
+$(WORKDIR)/fields%prg: fields.c
        @echo "FIXME: " $@ "will currently fail"
        $(CL65) $(CC65FLAGS) $< -o $@
        -$(SIM65) $(SIM65FLAGS) $@
-sitest%prg: sitest.c
+$(WORKDIR)/sitest%prg: sitest.c
        @echo "FIXME: " $@ "will currently fail"
        -$(CL65) $(CC65FLAGS) $< -o $@
        -$(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       @$(RM) *.o
-       @$(RM) *.prg
-       @$(RM) *.out
+       @$(RM) $(TESTS)
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.o,$(wildcard *.c))
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.out,$(wildcard *.c))
+
 

diff --git a/test/ref/Makefile b/test/ref/Makefile
index a8d87c4c315a16cab644f411bf6c10ba2768b04e..f14db3ecf75b01465f374ca80c92a1f96307b04c 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -26,66 +26,66 @@ CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow
 
 .PHONY: all clean
 
-REFS := $(patsubst %.c,%.ref,$(wildcard *.c))
+REFS := $(patsubst %.c,$(WORKDIR)/%.ref,$(wildcard *.c))
 
-TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.os.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.or.prg,$(wildcard *.c))
+TESTS := $(patsubst %.c,$(WORKDIR)/%.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.o.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.os.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.or.prg,$(wildcard *.c))
 
 all: $(REFS) $(TESTS)
 
-%.ref: %.c
-       $(CC) $(CFLAGS) $< -o $*.host
-       ./$*.host > $@
+$(WORKDIR)/%.ref: %.c
+       $(CC) $(CFLAGS) $< -o $(WORKDIR)/$*.host
+       $(WORKDIR)/$*.host > $@
 
-%.prg: %.c %.ref
+$(WORKDIR)/%.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.o.prg: %.c %.ref
+$(WORKDIR)/%.o.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.os.prg: %.c %.ref
+$(WORKDIR)/%.os.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.osi.prg: %.c %.ref
+$(WORKDIR)/%.osi.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.osir.prg: %.c %.ref
+$(WORKDIR)/%.osir.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.oi.prg: %.c %.ref
+$(WORKDIR)/%.oi.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.oir.prg: %.c %.ref
+$(WORKDIR)/%.oir.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
-%.or.prg: %.c %.ref
+$(WORKDIR)/%.or.prg: %.c $(WORKDIR)/%.ref
        $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@ > $*.out
-       $(DIFF) $*.out $*.ref
+       $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/$*.out
+       $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
 clean:
-       @$(RM) *.o
-       @$(RM) *.prg
-       @$(RM) *.out
-       @$(RM) *.ref
-       @$(RM) *.host
+       @$(RM) $(TESTS)
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.o,$(wildcard *.c))
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.out,$(wildcard *.c))
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.ref,$(wildcard *.c))
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.host,$(wildcard *.c))

diff --git a/test/val/Makefile b/test/val/Makefile
index 6a40feb6173d0b4adefd592ceabad898f77f3fd2..591f953890e7a8ce4f4d2de09d8204dd7000b579 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -21,49 +21,49 @@ WORKDIR := ./../../testwrk
 
 .PHONY: all clean
 
-TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.os.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.osir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oi.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.oir.prg,$(wildcard *.c))
-TESTS += $(patsubst %.c,%.or.prg,$(wildcard *.c))
+TESTS := $(patsubst %.c,$(WORKDIR)/%.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.o.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.os.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.osir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oi.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.oir.prg,$(wildcard *.c))
+TESTS += $(patsubst %.c,$(WORKDIR)/%.or.prg,$(wildcard *.c))
 
 all: $(TESTS)
 
-%.prg: %.c
+$(WORKDIR)/%.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.o.prg: %.c
+$(WORKDIR)/%.o.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.os.prg: %.c
+$(WORKDIR)/%.os.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.osi.prg: %.c
+$(WORKDIR)/%.osi.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.osir.prg: %.c
+$(WORKDIR)/%.osir.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.oi.prg: %.c
+$(WORKDIR)/%.oi.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.oir.prg: %.c
+$(WORKDIR)/%.oir.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
-%.or.prg: %.c
+$(WORKDIR)/%.or.prg: %.c
        $(CL65) $(CC65FLAGS) $< -o $@
        $(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       @$(RM) *.o
-       @$(RM) *.prg
+       @$(RM) $(TESTS)
+       @$(RM) $(patsubst %.c,$(WORKDIR)/%.o,$(wildcard *.c))