Allow to control test Makefile output via QUIET (like libsrc).

diff --git a/.travis.yml b/.travis.yml
index 10ea789cf3fbf9616a33db124139758c4643348c..fd2672887a527e682be8fb40e485a989f5a86e0e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ install:
 script:
   - make bin USER_CFLAGS=-Werror
   - make lib QUIET=1
-  - make -C test
+  - make -C test QUIET=1
   - make -C src clean
   - make bin USER_CFLAGS=-Werror CROSS_COMPILE=i686-w64-mingw32-
   - make doc zip

diff --git a/test/Makefile b/test/Makefile
index d0bee8ed84ef913a997653aa4ddf277edfbfa12f..c858835171d3cfb169d5f60e7303800f688569c1 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,5 @@
 # top-level Makefile for the regression tests
 
-# You can comment this special target when you debug the regression tests.
-# Then, make will give you more progress reports.
-.SILENT:
-
 ifneq ($(shell echo),)
   CMD_EXE = 1
 endif

diff --git a/test/asm/Makefile b/test/asm/Makefile
index fb840446c88648a664bb82a27c914afb6ec5713a..93210aaeeab614c08c55cedb333bf3935f193e0f 100644 (file)
--- a/test/asm/Makefile
+++ b/test/asm/Makefile
@@ -16,6 +16,10 @@ else
   DEL = $(RM) $1
 endif
 
+ifdef QUIET
+  .SILENT:
+endif
+
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 
 WORKDIR = ../../testwrk/asm
@@ -46,6 +50,7 @@ $(DIFF): ../bdiff.c | $(WORKDIR)
 define OPCODE_template
 
 $(WORKDIR)/$1-opcodes.bin: $1-opcodes.s $(DIFF)
+       $(if $(QUIET),echo asm/$1-opcodes.bin)
        $(CL65) --cpu $1 -t none -l $(WORKDIR)/$1-opcodes.lst -o $$@ $$<
        $(DIFF) $$@ $1-opcodes.ref
 
@@ -56,6 +61,7 @@ $(foreach cpu,$(OPCODE_CPUS),$(eval $(call OPCODE_template,$(cpu))))
 define CPUDETECT_template
 
 $(WORKDIR)/$1-cpudetect.bin: cpudetect.s $(DIFF)
+       $(if $(QUIET),echo asm/$1-cpudetect.bin)
        $(CL65) --cpu $1 -t none -l $(WORKDIR)/$1-cpudetect.lst -o $$@ $$<
        $(DIFF) $$@ $1-cpudetect.ref
 

diff --git a/test/dasm/Makefile b/test/dasm/Makefile
index f8942ef739ac00816aa39debbf740a0cf92c3ed7..d7071149117d779f9e10272b12469ef95d4427f2 100644 (file)
--- a/test/dasm/Makefile
+++ b/test/dasm/Makefile
@@ -16,6 +16,10 @@ else
   DEL = $(RM) $1
 endif
 
+ifdef QUIET
+  .SILENT:
+endif
+
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 DA65 := $(if $(wildcard ../../bin/da65*),../../bin/da65,da65)
 
@@ -52,6 +56,7 @@ $(WORKDIR)/$1-reass.s: $(WORKDIR)/$1-disass.bin
        $(DA65) --cpu $1 $(START) -o $$@ $$<
 
 $(WORKDIR)/$1-reass.bin: $(WORKDIR)/$1-reass.s $(DIFF)
+       $(if $(QUIET),echo dasm/$1-reass.bin)
        $(CL65) --cpu $1 -t none $(START) -o $$@ $$<
        $(DIFF) $$@ $(WORKDIR)/$1-disass.bin
 

diff --git a/test/err/Makefile b/test/err/Makefile
index 2bcc1d264ead21fd31ee542fe7bb7bf43350b3e3..4b05ca5db63f47fd838bdfcca25e57febd207910 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -5,16 +5,25 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
+  S = $(subst /,\,/)
   NOT = - # Hack
+  NULLDEV = nul:
   MKDIR = mkdir $(subst /,\,$1)
   RMDIR = -rmdir /s /q $(subst /,\,$1)
 else
+  S = /
   NOT = !
+  NULLDEV = /dev/null
   MKDIR = mkdir -p $1
   RMDIR = $(RM) -r $1
 endif
 
-CC65 := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65)
+ifdef QUIET
+  .SILENT:
+  NULLERR = 2>$(NULLDEV)
+endif
+
+CC65 := $(if $(wildcard ../../bin/cc65*),..$S..$Sbin$Scc65,cc65)
 
 WORKDIR = ../../testwrk/err
 
@@ -26,7 +35,8 @@ TESTS = $(patsubst %.c,$(WORKDIR)/%.s,$(SOURCES))
 all: $(TESTS)
 
 $(WORKDIR)/%.s: %.c
-       $(NOT) $(CC65) -o $@ $<
+       $(if $(QUIET),echo err/$*.s)
+       $(NOT) $(CC65) -o $@ $< $(NULLERR)
 
 clean:
        @$(call RMDIR,$(WORKDIR))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index 06ee2a84f4389bff027951972ef7ab3e2d6467b6..39a9a38686326deada73c800a3754e6c55d905a2 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -8,6 +8,7 @@ ifdef CMD_EXE
   S = $(subst /,\,/)
   NOT = - # Hack
   EXE = .exe
+  NULLDEV = nul:
   MKDIR = mkdir $(subst /,\,$1)
   RMDIR = -rmdir /s /q $(subst /,\,$1)
   DEL = del /f $(subst /,\,$1)
@@ -15,14 +16,21 @@ else
   S = /
   NOT = !
   EXE =
+  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)
+CL65 := $(if $(wildcard ../../bin/cl65*),..$S..$Sbin$Scl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
 
 WORKDIR = ..$S..$Stestwrk$Smisc
@@ -52,29 +60,31 @@ define PRG_template
 
 # should compile, but then hangs in an endless loop
 $(WORKDIR)/endless.$1.$2.prg: endless.c | $(WORKDIR)
-       $(CL65) -t sim$2 -$1 -o $$@ $$<
-       $(NOT) $(SIM65) $(SIM65FLAGS) $$@
+       $(if $(QUIET),echo misc/endless.$1.$2.prg)
+       $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+       $(NOT) $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT) $(NULLERR)
 
 # 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)
-       $(CL65) -t sim$2 -$1 -o $$@ $$<
+       $(if $(QUIET),echo misc/limits.$1.$2.prg)
+       $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
        $(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/limits.$1.out
        $(DIFF) $(WORKDIR)/limits.$1.out limits.ref
 
 # the rest are tests that fail currently for one reason or another
 $(WORKDIR)/fields.$1.$2.prg: fields.c | $(WORKDIR)
        @echo "FIXME: " $$@ "currently will fail."
-       $(CL65) -t sim$2 -$1 -o $$@ $$<
-       -$(SIM65) $(SIM65FLAGS) $$@
+       $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+       -$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 $(WORKDIR)/sitest.$1.$2.prg: sitest.c | $(WORKDIR)
        @echo "FIXME: " $$@ "currently will fail."
-       -$(CL65) -t sim$2 -$1 -o $$@ $$<
-#      -$(SIM65) $(SIM65FLAGS) $$@
+       -$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+#      -$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 $(WORKDIR)/cc65141011.$1.$2.prg: cc65141011.c | $(WORKDIR)
        @echo "FIXME: " $$@ "currently can fail."
-       $(CL65) -t sim$2 -$1 -o $$@ $$<
-       -$(SIM65) $(SIM65FLAGS) $$@
+       $(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
+       -$(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 
 endef # PRG_template
 

diff --git a/test/ref/Makefile b/test/ref/Makefile
index 55c859af1349a7e3afe109566d6b717fc994bf6e..c986513b85821c1d76e486ac74fd156eaa879f57 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -8,20 +8,27 @@ endif
 ifdef CMD_EXE
   S = $(subst /,\,/)
   EXE = .exe
+  NULLDEV = nul:
   MKDIR = mkdir $(subst /,\,$1)
   RMDIR = -rmdir /s /q $(subst /,\,$1)
   DEL = del /f $(subst /,\,$1)
 else
   S = /
   EXE =
+  NULLDEV = /dev/null
   MKDIR = mkdir -p $1
   RMDIR = $(RM) -r $1
   DEL = $(RM) $1
 endif
 
+ifdef QUIET
+  .SILENT:
+  NULLERR = 2>$(NULLDEV)
+endif
+
 SIM65FLAGS = -x 200000000
 
-CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+CL65 := $(if $(wildcard ../../bin/cl65*),..$S..$Sbin$Scl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
 
 WORKDIR = ..$S..$Stestwrk$Sref
@@ -46,7 +53,8 @@ $(WORKDIR):
        $(call MKDIR,$(WORKDIR))
 
 $(WORKDIR)/%.ref: %.c | $(WORKDIR)
-       $(CC) $(CFLAGS) -o $(WORKDIR)/$*.host $<
+       $(if $(QUIET),echo ref/$*.host)
+       $(CC) $(CFLAGS) -o $(WORKDIR)/$*.host $< $(NULLERR)
        $(WORKDIR)$S$*.host > $@
 
 $(DIFF): ../bdiff.c | $(WORKDIR)
@@ -71,7 +79,8 @@ $(WORKDIR)/yaccdbg.%.prg: yacc.c
 define PRG_template
 
 $(WORKDIR)/%.$1.$2.prg: %.c $(WORKDIR)/%.ref $(DIFF)
-       $(CL65) -t sim$2 $$(CC65FLAGS) -$1 -o $$@ $$<
+       $(if $(QUIET),echo ref/$$*.$1.$2.prg)
+       $(CL65) -t sim$2 $$(CC65FLAGS) -$1 -o $$@ $$< $(NULLERR)
        $(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/$$*.out
        $(DIFF) $(WORKDIR)/$$*.out $(WORKDIR)/$$*.ref
 

diff --git a/test/val/Makefile b/test/val/Makefile
index 2ae3e3b2804e32b3a89265ea8b0ee9a9c1ac8500..1981b36fe3fef0c0c21297afd35bd744b971c05d 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -18,9 +18,15 @@ else
   DEL = $(RM) $1
 endif
 
+ifdef QUIET
+  .SILENT:
+  NULLOUT = >$(NULLDEV)
+  NULLERR = 2>$(NULLDEV)
+endif
+
 SIM65FLAGS = -x 200000000
 
-CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+CL65 := $(if $(wildcard ../../bin/cl65*),..$S..$Sbin$Scl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),..$S..$Sbin$Ssim65,sim65)
 
 WORKDIR = ../../testwrk/val
@@ -58,8 +64,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) $$@ >$(NULLDEV)
+       $(if $(QUIET),echo val/$$*.$1.$2.prg)
+       $(CL65) -t sim$2 $$(CC65FLAGS) -$1 -o $$@ $$< $(NULLERR)
+       $(SIM65) $(SIM65FLAGS) $$@ $(NULLOUT)
 
 endef # PRG_template