Build the sqlite3_analyzer.exe and sqldiff.exe programs on "make test"

and "make smoketest" and other similar test targets.

FossilOrigin-Name: 1b83f2e7ddfdb488e732731f7a184d37edcad5af

diff --git a/Makefile.in b/Makefile.in
index b706c84b6ef594d6358430f9c32dd7ef3e55b870..d1371790848de813e520cf426c10d33c9cbe845c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -510,6 +510,15 @@ EXTHDR += \
 EXTHDR += \
   $(TOP)/ext/rtree/sqlite3rtree.h
 
+# executabled needed for testing
+#
+TESTPROGS = \
+  testfixture$(TEXE) \
+  sqlite3$(TEXE) \
+  sqlite3_analyzer$(TEXE) \
+  sqldiff$(TEXE)
+
+
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
@@ -955,11 +964,11 @@ testfixture$(TEXE):       $(TESTFIXTURE_SRC)
                -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
 
 # A very detailed test running most or all test cases
-fulltest:      testfixture$(TEXE) sqlite3$(TEXE) fuzztest
+fulltest:      $(TESTPROGS) fuzztest
        ./testfixture$(TEXE) $(TOP)/test/all.test
 
 # Really really long testing
-soaktest:      testfixture$(TEXE) sqlite3$(TEXE) fuzzoomtest
+soaktest:      $(TESTPROGS) fuzzoomtest
        ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
 
 # Do extra testing but not aeverything.
@@ -976,13 +985,13 @@ fuzzoomtest:      fuzzershell$(TEXE)
 # This is the common case.  Run many tests but not those that take
 # a really long time.
 #
-test:  testfixture$(TEXE) sqlite3$(TEXE) fuzztest
+test:  $(TESTPROGS) fuzztest
        ./testfixture$(TEXE) $(TOP)/test/veryquick.test
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.
 #
-valgrindtest:  testfixture$(TEXE) sqlite3$(TEXE) fuzzershell$(TEXE)
+valgrindtest:  $(TESTPROGS) fuzzershell$(TEXE)
        valgrind -v ./fuzzershell$(TEXE) -f $(TOP)/test/fuzzdata1.txt
        OMIT_MISUSE=1 valgrind -v ./testfixture$(TEXE) $(TOP)/test/permutations.test valgrind
 
@@ -990,7 +999,7 @@ valgrindtest:       testfixture$(TEXE) sqlite3$(TEXE) fuzzershell$(TEXE)
 # the 60s-era electronics testing:  "Turn it on and see if smoke
 # comes out."
 #
-smoketest:     testfixture$(TEXE) fuzzershell$(TEXE)
+smoketest:     $(TESTPROGS) fuzzershell$(TEXE)
        ./testfixture$(TEXE) $(TOP)/test/main.test
 
 sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl

diff --git a/Makefile.msc b/Makefile.msc
index df3985162cb70b2d936410d19c16f46622a2a627..013a0f3427a1a9c62fb92915f0cbfa21860b830b 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1172,6 +1172,15 @@ EXTHDR = $(EXTHDR) \
 EXTHDR = $(EXTHDR) \
   $(TOP)\ext\rtree\sqlite3rtree.h
 
+# executabled needed for testing
+#
+TESTPROGS = \
+  testfixture.exe \
+  sqlite3.exe \
+  sqlite3_analyzer.exe \
+  sqldiff.exe
+
+
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
@@ -1635,13 +1644,13 @@ testfixture.exe:        $(TESTFIXTURE_SRC) $(LIBRESOBJS) $(HDR)
 extensiontest: testfixture.exe testloadext.dll
        .\testfixture.exe $(TOP)\test\loadext.test
 
-fulltest:      testfixture.exe sqlite3.exe fuzztest
+fulltest:      $(TESTPROGS) fuzztest
        .\testfixture.exe $(TOP)\test\all.test
 
-soaktest:      testfixture.exe sqlite3.exe fuzzoomtest
+soaktest:      $(TESTPROGS) fuzzoomtest
        .\testfixture.exe $(TOP)\test\all.test -soak=1
 
-fulltestonly:  testfixture.exe sqlite3.exe fuzztest
+fulltestonly:  $(TESTPROGS) fuzztest
        .\testfixture.exe $(TOP)\test\full.test
 
 queryplantest: testfixture.exe sqlite3.exe
@@ -1653,10 +1662,10 @@ fuzztest:       fuzzershell.exe
 fuzzoomtest:   fuzzershell.exe
        .\fuzzershell.exe -f $(TOP)\test\fuzzdata1.txt --oom
 
-test:  testfixture.exe sqlite3.exe fuzztest
+test:  $(TESTPROGS) fuzztest
        .\testfixture.exe $(TOP)\test\veryquick.test
 
-smoketest:     testfixture.exe
+smoketest:     $(TESTPROGS)
        .\testfixture.exe $(TOP)\test\main.test
 
 sqlite3_analyzer.c: $(SQLITE3C) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl

diff --git a/main.mk b/main.mk
index 7ac686873a90944ca50d86eea31ebf03c0bae54b..6e0828be95cc19458de68ded4d3b0896265c723e 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -391,6 +391,14 @@ EXTHDR += \
 EXTHDR += \
   $(TOP)/ext/userauth/sqlite3userauth.h
 
+# executabled needed for testing
+#
+TESTPROGS = \
+  testfixture$(EXE) \
+  sqlite3$(EXE) \
+  sqlite3_analyzer$(EXE) \
+  sqldiff$(EXE)
+
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
@@ -635,13 +643,13 @@ fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
                $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts3amal.c       \
                -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
 
-fulltest:      testfixture$(EXE) sqlite3$(EXE) fuzztest
+fulltest:      $(TESTPROGS) fuzztest
        ./testfixture$(EXE) $(TOP)/test/all.test
 
-soaktest:      testfixture$(EXE) sqlite3$(EXE) fuzzoomtest
+soaktest:      $(TESTPROGS) fuzzoomtest
        ./testfixture$(EXE) $(TOP)/test/all.test -soak=1
 
-fulltestonly:  testfixture$(EXE) sqlite3$(EXE) fuzztest
+fulltestonly:  $(TESTPROGS) fuzztest
        ./testfixture$(EXE) $(TOP)/test/full.test
 
 queryplantest: testfixture$(EXE) sqlite3$(EXE)
@@ -653,13 +661,13 @@ fuzztest: fuzzershell$(EXE)
 fuzzoomtest:   fuzzershell$(EXE)
        ./fuzzershell$(EXE) -f $(TOP)/test/fuzzdata1.txt --oom
 
-test:  testfixture$(EXE) sqlite3$(EXE) fuzztest
+test:  $(TESTPROGS) fuzztest
        ./testfixture$(EXE) $(TOP)/test/veryquick.test
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.
 #
-valgrindtest:  testfixture$(EXE) sqlite3$(EXE) fuzzershell$(EXE)
+valgrindtest:  $(TESTPROGS) fuzzershell$(EXE)
        valgrind -v ./fuzzershell$(EXE) -f $(TOP)/test/fuzzdata1.txt
        OMIT_MISUSE=1 valgrind -v ./testfixture$(EXE) $(TOP)/test/permutations.test valgrind
 

diff --git a/manifest b/manifest
index e763ee54f3c667714116ceff8d33adab4969b04e..725b9adf2dbe2195386d60d0a26c212301e6e626 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Revamp\sthe\sway\sthe\sDBSTAT\svirtual\stable\sis\sregistered.
-D 2015-05-11T11:59:15.863
+C Build\sthe\ssqlite3_analyzer.exe\sand\ssqldiff.exe\sprograms\son\s"make\stest"\nand\s"make\ssmoketest"\sand\sother\ssimilar\stest\stargets.
+D 2015-05-11T12:15:45.279
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 72931ef100ef7dfbfc3d1f42d85da59f1aae430d
+F Makefile.in 13f5add36234e93cbebf9153d3920623ca7fd7ab
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc c6241f7fa2912427410ef15429c8ab5601e19a71
+F Makefile.msc 042b52591ab5fe3047e2d37858e77b894f6d0ef0
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
@@ -152,7 +152,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk f012feb95fc4acfb583f89b6f9d1dc6253a8f08d
+F main.mk cb55a01d762d7dd6722232b98665843ef93d8d1e
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -1256,7 +1256,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 85bfa9a67f9970843c55c3fbe0ec44ace6985896
-R 189fc358e8ba2d525e3e3c8a3c5e8737
+P 4e6520159e729b6ea96ccdb14f0ecb00a0ff7cbd
+R efe77b0d0c67edf1e2c0b42f110eae7b
 U drh
-Z 8b69c9f4cff7121b2fbd1c4aae9fe407
+Z 64fd5a5789d465ed8546db070d4d7ca4

diff --git a/manifest.uuid b/manifest.uuid
index a2b8dd3f2c9b1810fdc47c513fa06d7b828e4651..a6dab124b1a8093272362f505b5ef68660e1c9dc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e6520159e729b6ea96ccdb14f0ecb00a0ff7cbd
\ No newline at end of file
+1b83f2e7ddfdb488e732731f7a184d37edcad5af
\ No newline at end of file