goto.c warning fix for implicit truncation

[cc65] / test / val / Makefile

diff --git a/test/val/Makefile b/test/val/Makefile
index 425d8ace69eef1f720ad17cb54161607e757b030..fe194d892154a94c38e4b57a36262566bfda372c 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -5,37 +5,40 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
+  S = $(subst /,\,/)
+  NULLDEV = nul:
   MKDIR = mkdir $(subst /,\,$1)
   RMDIR = -rmdir /s /q $(subst /,\,$1)
   DEL = del /f $(subst /,\,$1)
 else
+  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
+
 SIM65FLAGS = -x 200000000
 
-CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
-SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
+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 Oi Oir Or
+OPTIONS = g O Os Osi Osir Osr Oi Oir Or
 
 .PHONY: all clean
 
 SOURCES := $(wildcard *.c)
-TESTS := $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).6502.prg))
+TESTS  = $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).6502.prg))
 TESTS += $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).65c02.prg))
 
-# FIXME: These tests fail when built with optimizations for the 65c02
-TESTS := $(filter-out $(WORKDIR)/compare7.O%.65c02.prg,$(TESTS))
-TESTS := $(filter-out $(WORKDIR)/compare8.O%.65c02.prg,$(TESTS))
-TESTS := $(filter-out $(WORKDIR)/compare9.O%.65c02.prg,$(TESTS))
-TESTS := $(filter-out $(WORKDIR)/compare10.O%.65c02.prg,$(TESTS))
-TESTS := $(filter-out $(WORKDIR)/or1.O%.65c02.prg,$(TESTS))
-
 all: $(TESTS)
 
 $(WORKDIR):
@@ -54,8 +57,9 @@ $(WORKDIR)/cq84.%.prg: CC65FLAGS += -Wc --all-cdecl
 define PRG_template
 
 $(WORKDIR)/%.$1.$2.prg: %.c | $(WORKDIR)
-       $(CL65) -t sim$2 $$(CC65FLAGS) -$1 -o $$@ $$<
-       $(SIM65) $(SIM65FLAGS) $$@
+       $(if $(QUIET),echo val/$$*.$1.$2.prg)
+       $(CL65) -t sim$2 $$(CC65FLAGS) -$1 -o $$@ $$< $(NULLERR)
+       $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 
 endef # PRG_template