From b2d799824197bb899459e34fbfdf085f20880cf1 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Tue, 21 Jul 2020 19:15:41 +0200 Subject: [PATCH] update makefile to use $(NOT) as discussed with Oliver --- test/misc/Makefile | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/test/misc/Makefile b/test/misc/Makefile index 96f61dba1..1405e05bf 100644 --- a/test/misc/Makefile +++ b/test/misc/Makefile @@ -66,37 +66,42 @@ define PRG_template # should compile, but gives an error $(WORKDIR)/bug975.$1.$2.prg: bug975.c | $(WORKDIR) $(if $(QUIET),echo misc/bug975.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # should compile, but gives an error $(WORKDIR)/bug250.$1.$2.prg: bug250.c | $(WORKDIR) + @echo "FIXME: " $$@ "currently does not compile." $(if $(QUIET),echo misc/bug250.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(NOT) $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # should compile, but gives an error $(WORKDIR)/bug760.$1.$2.prg: bug760.c | $(WORKDIR) + @echo "FIXME: " $$@ "currently does not compile." $(if $(QUIET),echo misc/bug760.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(NOT) $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # should compile, but gives an error $(WORKDIR)/pptest2.$1.$2.prg: pptest2.c | $(WORKDIR) + @echo "FIXME: " $$@ "currently does not compile." $(if $(QUIET),echo misc/pptest2.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(NOT) $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # this should fail to compile, because cc65 does not support returning structs $(WORKDIR)/bug264.$1.$2.prg: bug264.c | $(WORKDIR) + @echo "FIXME: " $$@ "compiles but should give an error." $(if $(QUIET),echo misc/bug264.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # this should fail to compile, because there are errors in the code $(WORKDIR)/bug1048.$1.$2.prg: bug1048.c | $(WORKDIR) + @echo "FIXME: " $$@ "compiles but should give an error." $(if $(QUIET),echo misc/bug1048.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # internal compiler error $(WORKDIR)/bug1075.$1.$2.prg: bug1075.c | $(WORKDIR) $(if $(QUIET),echo misc/bug1075.$1.$2.prg) - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) + $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) # should compile, but then hangs in an endless loop $(WORKDIR)/endless.$1.$2.prg: endless.c | $(WORKDIR) @@ -106,13 +111,13 @@ $(WORKDIR)/endless.$1.$2.prg: endless.c | $(WORKDIR) # these need reference data that can't be generated by a host-compiled program, # in a useful way -$(WORKDIR)/limits.$1.$2.prg: limits.c $(DIFF) +$(WORKDIR)/limits.$1.$2.prg: limits.c $(DIFF) | $(WORKDIR) $(if $(QUIET),echo misc/limits.$1.$2.prg) $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) $(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/limits.$1.$2.out $(DIFF) $(WORKDIR)/limits.$1.$2.out limits.ref -$(WORKDIR)/goto.$1.$2.prg: goto.c $(DIFF) +$(WORKDIR)/goto.$1.$2.prg: goto.c $(DIFF) | $(WORKDIR) $(if $(QUIET),echo misc/goto.$1.$2.prg) $(CL65) -t sim$2 -$1 -o $$@ $$< 2>$(WORKDIR)/goto.$1.$2.out $(DIFF) $(WORKDIR)/goto.$1.$2.out goto.ref @@ -121,11 +126,12 @@ $(WORKDIR)/goto.$1.$2.prg: goto.c $(DIFF) $(WORKDIR)/fields.$1.$2.prg: fields.c | $(WORKDIR) @echo "FIXME: " $$@ "currently will fail." $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) - -$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) + $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) + $(WORKDIR)/sitest.$1.$2.prg: sitest.c | $(WORKDIR) - @echo "FIXME: " $$@ "currently will fail." - -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) -# -$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) + @echo "FIXME: " $$@ "currently does not compile." + $(NOT) $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR) +# $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) endef # PRG_template