Fossil SCM

The -quiet flag passed by default to tester.tcl can now be overridden by passing TESTFLAGS to make. Before, there was no way to set -verbose this way because "-quiet -verbose" means the same thing as "-quiet".

wyoung 2018-09-03 00:24 trunk

Commit 401a4c3d463bd0485f80dc98bb2cb8407f7da749277acdd0a518596bc798d10a

Parent 2e4143aa4b8800d…

2 files changed +2 -1 +2 -1

~ src/main.mk ~ src/makemake.tcl

M src/main.mk

+2 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -11,10 +11,11 @@
11	11	#
12	12
13	13	XBCC = $(BCC) $(BCCFLAGS)
14	14	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
15	15
	16	+TESTFLAGS := -quiet
16	17
17	18	SRC = \
18	19	$(SRCDIR)/add.c \
19	20	$(SRCDIR)/alerts.c \
20	21	$(SRCDIR)/allrepo.c \
		@@ -546,11 +547,11 @@
546	547	#
547	548	# TESTFLAGS can also include names of specific test files to limit
548	549	# the run to just those test cases.
549	550	#
550	551	test: $(OBJDIR) $(APPNAME)
551		- $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
	552	+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
552	553
553	554	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
554	555	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
555	556
556	557	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
557	558

	--- src/main.mk
	+++ src/main.mk
	@@ -11,10 +11,11 @@
11	#
12
13	XBCC = $(BCC) $(BCCFLAGS)
14	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
15

16
17	SRC = \
18	$(SRCDIR)/add.c \
19	$(SRCDIR)/alerts.c \
20	$(SRCDIR)/allrepo.c \
	@@ -546,11 +547,11 @@
546	#
547	# TESTFLAGS can also include names of specific test files to limit
548	# the run to just those test cases.
549	#
550	test: $(OBJDIR) $(APPNAME)
551	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
552
553	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
554	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
555
556	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
557

	--- src/main.mk
	+++ src/main.mk
	@@ -11,10 +11,11 @@
11	#
12
13	XBCC = $(BCC) $(BCCFLAGS)
14	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
15
16	TESTFLAGS := -quiet
17
18	SRC = \
19	$(SRCDIR)/add.c \
20	$(SRCDIR)/alerts.c \
21	$(SRCDIR)/allrepo.c \
	@@ -546,11 +547,11 @@
547	#
548	# TESTFLAGS can also include names of specific test files to limit
549	# the run to just those test cases.
550	#
551	test: $(OBJDIR) $(APPNAME)
552	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
553
554	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
555	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
556
557	$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
558

M src/makemake.tcl

+2 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -286,10 +286,11 @@
286	286	#
287	287
288	288	XBCC = $(BCC) $(BCCFLAGS)
289	289	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
290	290
	291	+TESTFLAGS := -quiet
291	292	}
292	293	writeln -nonewline "SRC ="
293	294	foreach s [lsort $src] {
294	295	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
295	296	}
		@@ -361,11 +362,11 @@
361	362	#
362	363	# TESTFLAGS can also include names of specific test files to limit
363	364	# the run to just those test cases.
364	365	#
365	366	test: $(OBJDIR) $(APPNAME)
366		- $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
	367	+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
367	368
368	369	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
369	370	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
370	371	$(SRCDIR)/../manifest \
371	372	$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
372	373

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -286,10 +286,11 @@
286	#
287
288	XBCC = $(BCC) $(BCCFLAGS)
289	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
290

291	}
292	writeln -nonewline "SRC ="
293	foreach s [lsort $src] {
294	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
295	}
	@@ -361,11 +362,11 @@
361	#
362	# TESTFLAGS can also include names of specific test files to limit
363	# the run to just those test cases.
364	#
365	test: $(OBJDIR) $(APPNAME)
366	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
367
368	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
369	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
370	$(SRCDIR)/../manifest \
371	$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
372

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -286,10 +286,11 @@
286	#
287
288	XBCC = $(BCC) $(BCCFLAGS)
289	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
290
291	TESTFLAGS := -quiet
292	}
293	writeln -nonewline "SRC ="
294	foreach s [lsort $src] {
295	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
296	}
	@@ -361,11 +362,11 @@
362	#
363	# TESTFLAGS can also include names of specific test files to limit
364	# the run to just those test cases.
365	#
366	test: $(OBJDIR) $(APPNAME)
367	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
368
369	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
370	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
371	$(SRCDIR)/../manifest \
372	$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
373

Fossil SCM

Keyboard Shortcuts