Adjust the unix makefiles so that "make test" runs fuzzcheck prior to even

attempting to build the other test programs.

FossilOrigin-Name: bb48f7a55945da4cee369bae0809037900fcaac7

diff --git a/Makefile.in b/Makefile.in
index 4218ab99141f90f0abcff9f407158b7e874c8cc4..4da74d4f0740b4ae4e18ceebf99d4e81eadbd69c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1109,6 +1109,10 @@ fastfuzztest:    fuzzcheck$(TEXE) $(FUZZDATA)
 valgrindfuzz:  fuzzcheck$(TEXT) $(FUZZDATA)
        valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
 
+# The veryquick.test TCL tests.
+#
+tcltest:       ./testfixture$(TEXE)
+       ./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)
 
 # Minimal testing that runs in less than 3 minutes
 #
@@ -1118,8 +1122,7 @@ quicktest:        ./testfixture$(TEXE)
 # This is the common case.  Run many tests that do not take too long,
 # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
-test:  $(TESTPROGS) sourcetest fastfuzztest
-       ./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)
+test:  fastfuzztest $(TESTPROGS) tcltest sourcetest
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.

diff --git a/main.mk b/main.mk
index 5709afc8d136d4e05bccbacabd0327cf3a15c466..91487b72b34265cf25103324758c1b10e4aa0f37 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -798,6 +798,11 @@ fastfuzztest:      fuzzcheck$(EXE) $(FUZZDATA)
 valgrindfuzz:  fuzzcheck$(EXE) $(FUZZDATA)
        valgrind ./fuzzcheck$(EXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
 
+# The veryquick.test TCL tests.
+#
+tcltest:       ./testfixture$(EXE)
+       ./testfixture$(EXE) $(TOP)/test/veryquick.test $(TESTOPTS)
+
 # A very quick test using only testfixture and omitting all the slower
 # tests.  Designed to run in under 3 minutes on a workstation.
 #
@@ -806,9 +811,7 @@ quicktest:  ./testfixture$(EXE)
 
 # The default test case.  Runs most of the faster standard TCL tests,
 # and fuzz tests, and sqlite3_analyzer and sqldiff tests.
-#
-test:  $(TESTPROGS) sourcetest fastfuzztest
-       ./testfixture$(EXE) $(TOP)/test/veryquick.test $(TESTOPTS)
+test:  fastfuzztest sourcetest $(TESTPROGS) tcltest
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.

diff --git a/manifest b/manifest
index 26d50e31a587b1a3ce88e536e5c3a9d76b1ed91d..c5473dbdf2813cabac48c2b0ed2b68004c30f210 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Three\stimes\sfaster\ssqlite3SrcListAppend()\sin\sthe\scommon\scase\sby\savoiding\sthe\ncall\sto\ssqlite3SrcListEnlarge()\sfor\sthe\sfirst\sallocation.
-D 2016-12-14T11:14:13.907
-F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
+C Adjust\sthe\sunix\smakefiles\sso\sthat\s"make\stest"\sruns\sfuzzcheck\sprior\sto\seven\nattempting\sto\sbuild\sthe\sother\stest\sprograms.
+D 2016-12-14T11:23:51.380
+F Makefile.in 609c5f7a19d5b5d2dff61f8a4740581fee34b8af
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@ -312,7 +312,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk da18a283b8fc3c6892e9205e6228f3ae60d8cd8d
+F main.mk bd1149fdb5543e432a8530a0ea7642613a655bc1
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1536,7 +1536,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6aa9b26544cbd0b41115c5f127dcf9a286d17e2b
-R 5c6f1d55f58a01899a13212bdf50e07f
+P 0ea2762f1d8f6a93ae2ee3b7b835927a474c6f66
+R 780cd0abdea39fa1a5d5daabb688bd72
 U drh
-Z b26cd3596202cf83d05f18857a98dc5b
+Z 2e2657a5376509e8032ac3542578485e

diff --git a/manifest.uuid b/manifest.uuid
index 1d21ba4de4c971e00d46f8b2c55dc69fcfc5729e..a695a69c1f3308356e58474abd410acf239f9d66 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ea2762f1d8f6a93ae2ee3b7b835927a474c6f66
\ No newline at end of file
+bb48f7a55945da4cee369bae0809037900fcaac7
\ No newline at end of file