goto.c warning fix for implicit truncation

[cc65] / test / val / Makefile

diff --git a/test/val/Makefile b/test/val/Makefile
index 2efcbd0dee13334c757ec0d31aa1ef4f6ba6b0fc..fe194d892154a94c38e4b57a36262566bfda372c 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -1,63 +1,71 @@
-
-# makefile for the regression tests that return an error code on failure
+# Makefile for the regression tests that return an error code on failure
 
 ifneq ($(shell echo),)
-  CMD_EXE := 1
+  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 /,\,/)
+  NULLDEV = nul:
+  MKDIR = mkdir $(subst /,\,$1)
+  RMDIR = -rmdir /s /q $(subst /,\,$1)
+  DEL = del /f $(subst /,\,$1)
 else
-RM := rm -f
+  S = /
+  NULLDEV = /dev/null
+  MKDIR = mkdir -p $1
+  RMDIR = $(RM) -r $1
+  DEL = $(RM) $1
+endif
+
+ifdef QUIET
+  .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
 endif
 
-WORKDIR := ../../testwrk
+SIM65FLAGS = -x 200000000
+
+CL65 := $(if $(wildcard ../../bin/cl65*),..$S..$Sbin$Scl65,cl65)
+SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
+
+WORKDIR = ../../testwrk/val
+
+OPTIONS = g O Os Osi Osir Osr Oi Oir Or
 
 .PHONY: all clean
 
 SOURCES := $(wildcard *.c)
-TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=$(WORKDIR)/%$(option)prg))
+TESTS  = $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).6502.prg))
+TESTS += $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).65c02.prg))
 
 all: $(TESTS)
 
-$(WORKDIR)/%.prg: %.c
-       $(CL65) $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
-
-$(WORKDIR)/%.o.prg: %.c
-       $(CL65) -O $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
-
-$(WORKDIR)/%.os.prg: %.c
-       $(CL65) -Os $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
+$(WORKDIR):
+       $(call MKDIR,$(WORKDIR))
 
-$(WORKDIR)/%.osi.prg: %.c
-       $(CL65) -Osi $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
+# Some files have "K & R"-style syntax.  Therefore, some forward
+# function-declarations don't match the later function definitions.
+# Those programs fail when fastcall is used; but, the cdecl calling convention
+# tolerates those conflicts.  Therefore, make their functions default to cdecl.
+#
+$(WORKDIR)/cq4.%.prg  \
+$(WORKDIR)/cq71.%.prg \
+$(WORKDIR)/cq81.%.prg \
+$(WORKDIR)/cq84.%.prg: CC65FLAGS += -Wc --all-cdecl
 
-$(WORKDIR)/%.osir.prg: %.c
-       $(CL65) -Osir $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
+define PRG_template
 
-$(WORKDIR)/%.oi.prg: %.c
-       $(CL65) -Oi $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
+$(WORKDIR)/%.$1.$2.prg: %.c | $(WORKDIR)
+       $(if $(QUIET),echo val/$$*.$1.$2.prg)
+       $(CL65) -t sim$2 $$(CC65FLAGS) -$1 -o $$@ $$< $(NULLERR)
+       $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 
-$(WORKDIR)/%.oir.prg: %.c
-       $(CL65) -Oir $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
+endef # PRG_template
 
-$(WORKDIR)/%.or.prg: %.c
-       $(CL65) -Or $(CC65FLAGS) $< -o $@
-       $(SIM65) $(SIM65FLAGS) $@
+$(foreach option,$(OPTIONS),$(eval $(call PRG_template,$(option),6502)))
+$(foreach option,$(OPTIONS),$(eval $(call PRG_template,$(option),65c02)))
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
+       @$(call RMDIR,$(WORKDIR))
+       @$(call DEL,$(SOURCES:.c=.o))