Fossil SCM
Tweak make test to not include the obsolete scary warning, to use the -quiet flag, and to include the empty by default TESTFLAGS macro so that make test can be used as an easy way to invoke the test runner. Changes made in makemake.tcl, which was then run to regenerate main.mk.
Commit
9dc8ff235efdb85193fa1158178af46704e973b9
Parent
95f7fe5a8f65c5d…
2 files changed
+14
-4
+14
-4
+14
-4
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -459,15 +459,25 @@ | ||
| 459 | 459 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 460 | 460 | |
| 461 | 461 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 462 | 462 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 463 | 463 | |
| 464 | -# WARNING. DANGER. Running the test suite modifies the repository the | |
| 465 | -# build is done from, i.e. the checkout belongs to. Do not sync/push | |
| 466 | -# the repository after running the tests. | |
| 464 | +# Run the test suite. | |
| 465 | +# Other flags that can be included in TESTFLAGS are: | |
| 466 | +# | |
| 467 | +# -halt Stop testing after the first failed test | |
| 468 | +# -keep Keep the temporary workspace for debugging | |
| 469 | +# -prot Write a detailed log of the tests to the file ./prot | |
| 470 | +# -verbose Include even more details in the output | |
| 471 | +# -quiet Hide most output from the terminal | |
| 472 | +# -strict Treat known bugs as failures | |
| 473 | +# | |
| 474 | +# TESTFLAGS can also include names of specific test files to limit | |
| 475 | +# the run to just those test cases. | |
| 476 | +# | |
| 467 | 477 | test: $(OBJDIR) $(APPNAME) |
| 468 | - $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) | |
| 478 | + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS) | |
| 469 | 479 | |
| 470 | 480 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 471 | 481 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 472 | 482 | |
| 473 | 483 | # Setup the options used to compile the included SQLite library. |
| 474 | 484 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -459,15 +459,25 @@ | |
| 459 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 460 | |
| 461 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 462 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 463 | |
| 464 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 465 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 466 | # the repository after running the tests. |
| 467 | test: $(OBJDIR) $(APPNAME) |
| 468 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 469 | |
| 470 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 471 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 472 | |
| 473 | # Setup the options used to compile the included SQLite library. |
| 474 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -459,15 +459,25 @@ | |
| 459 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 460 | |
| 461 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 462 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 463 | |
| 464 | # Run the test suite. |
| 465 | # Other flags that can be included in TESTFLAGS are: |
| 466 | # |
| 467 | # -halt Stop testing after the first failed test |
| 468 | # -keep Keep the temporary workspace for debugging |
| 469 | # -prot Write a detailed log of the tests to the file ./prot |
| 470 | # -verbose Include even more details in the output |
| 471 | # -quiet Hide most output from the terminal |
| 472 | # -strict Treat known bugs as failures |
| 473 | # |
| 474 | # TESTFLAGS can also include names of specific test files to limit |
| 475 | # the run to just those test cases. |
| 476 | # |
| 477 | test: $(OBJDIR) $(APPNAME) |
| 478 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS) |
| 479 | |
| 480 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 481 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 482 | |
| 483 | # Setup the options used to compile the included SQLite library. |
| 484 |
+14
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -303,15 +303,25 @@ | ||
| 303 | 303 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 304 | 304 | |
| 305 | 305 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 306 | 306 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 307 | 307 | |
| 308 | -# WARNING. DANGER. Running the test suite modifies the repository the | |
| 309 | -# build is done from, i.e. the checkout belongs to. Do not sync/push | |
| 310 | -# the repository after running the tests. | |
| 308 | +# Run the test suite. | |
| 309 | +# Other flags that can be included in TESTFLAGS are: | |
| 310 | +# | |
| 311 | +# -halt Stop testing after the first failed test | |
| 312 | +# -keep Keep the temporary workspace for debugging | |
| 313 | +# -prot Write a detailed log of the tests to the file ./prot | |
| 314 | +# -verbose Include even more details in the output | |
| 315 | +# -quiet Hide most output from the terminal | |
| 316 | +# -strict Treat known bugs as failures | |
| 317 | +# | |
| 318 | +# TESTFLAGS can also include names of specific test files to limit | |
| 319 | +# the run to just those test cases. | |
| 320 | +# | |
| 311 | 321 | test: $(OBJDIR) $(APPNAME) |
| 312 | - $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) | |
| 322 | + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS) | |
| 313 | 323 | |
| 314 | 324 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 315 | 325 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ |
| 316 | 326 | $(SRCDIR)/../manifest \ |
| 317 | 327 | $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 318 | 328 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -303,15 +303,25 @@ | |
| 303 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 304 | |
| 305 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 306 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 307 | |
| 308 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 309 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 310 | # the repository after running the tests. |
| 311 | test: $(OBJDIR) $(APPNAME) |
| 312 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 313 | |
| 314 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 315 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ |
| 316 | $(SRCDIR)/../manifest \ |
| 317 | $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 318 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -303,15 +303,25 @@ | |
| 303 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 304 | |
| 305 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 306 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 307 | |
| 308 | # Run the test suite. |
| 309 | # Other flags that can be included in TESTFLAGS are: |
| 310 | # |
| 311 | # -halt Stop testing after the first failed test |
| 312 | # -keep Keep the temporary workspace for debugging |
| 313 | # -prot Write a detailed log of the tests to the file ./prot |
| 314 | # -verbose Include even more details in the output |
| 315 | # -quiet Hide most output from the terminal |
| 316 | # -strict Treat known bugs as failures |
| 317 | # |
| 318 | # TESTFLAGS can also include names of specific test files to limit |
| 319 | # the run to just those test cases. |
| 320 | # |
| 321 | test: $(OBJDIR) $(APPNAME) |
| 322 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS) |
| 323 | |
| 324 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 325 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ |
| 326 | $(SRCDIR)/../manifest \ |
| 327 | $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 328 |