Fix minor Makefile typos. Improve consistency of MSVC makefile. Add new targets...

FossilOrigin-Name: f84fbe98994c602de6c0b242dcbad3ab77298425

diff --git a/Makefile.in b/Makefile.in
index d1371790848de813e520cf426c10d33c9cbe845c..a6984b2fd839ffd7da58d8100a70f7118c49bd4b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -510,7 +510,7 @@ EXTHDR += \
 EXTHDR += \
   $(TOP)/ext/rtree/sqlite3rtree.h
 
-# executabled needed for testing
+# executables needed for testing
 #
 TESTPROGS = \
   testfixture$(TEXE) \
@@ -971,8 +971,8 @@ fulltest:   $(TESTPROGS) fuzztest
 soaktest:      $(TESTPROGS) fuzzoomtest
        ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
 
-# Do extra testing but not aeverything.
-fulltestonly:  testfixture$(TEXE) sqlite3$(TEXE)
+# Do extra testing but not everything.
+fulltestonly:  $(TESTPROGS)
        ./testfixture$(TEXE) $(TOP)/test/full.test
 
 # Fuzz testing
@@ -1115,6 +1115,8 @@ clean:
        rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
        rm -f sqlite-*-output.vsix
        rm -f mptester mptester.exe
+       rm -f fuzzershell fuzzershell.exe
+       rm -f sqldiff sqldiff.exe
 
 distclean:     clean
        rm -f config.log config.status libtool Makefile sqlite3.pc

diff --git a/Makefile.msc b/Makefile.msc
index 013a0f3427a1a9c62fb92915f0cbfa21860b830b..487d85bfc7a21ea5bfb771604e5c655646f9c185 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1172,7 +1172,7 @@ EXTHDR = $(EXTHDR) \
 EXTHDR = $(EXTHDR) \
   $(TOP)\ext\rtree\sqlite3rtree.h
 
-# executabled needed for testing
+# executables needed for testing
 #
 TESTPROGS = \
   testfixture.exe \
@@ -1665,18 +1665,20 @@ fuzzoomtest:    fuzzershell.exe
 test:  $(TESTPROGS) fuzztest
        .\testfixture.exe $(TOP)\test\veryquick.test
 
-smoketest:     $(TESTPROGS)
+smoketest:     $(TESTPROGS) fuzzershell.exe
        .\testfixture.exe $(TOP)\test\main.test
 
 sqlite3_analyzer.c: $(SQLITE3C) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
-       copy $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
+       echo #define TCLSH 2 > $@
+       echo #define SQLITE_ENABLE_DBSTAT_VTAB 1 >> $@
+       copy $@ + $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
        echo static const char *tclsh_main_loop(void){ >> $@
        echo static const char *zMainloop = >> $@
        $(NAWK) -f $(TOP)\tool\tostr.awk $(TOP)\tool\spaceanal.tcl >> $@
        echo ; return zMainloop; } >> $@
 
 sqlite3_analyzer.exe:  sqlite3_analyzer.c $(LIBRESOBJS)
-       $(LTLINK) $(NO_WARN) -DBUILD_sqlite -DSQLITE_ENABLE_DBSTAT_VTAB -DTCLSH=2 -I$(TCLINCDIR) sqlite3_analyzer.c \
+       $(LTLINK) $(NO_WARN) -DBUILD_sqlite -I$(TCLINCDIR) sqlite3_analyzer.c \
                /link $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
 testloadext.lo:        $(TOP)\src\test_loadext.c
@@ -1746,6 +1748,7 @@ clean:
        del /Q shell.c sqlite3ext.h 2>NUL
        del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
        del /Q sqlite-*-output.vsix 2>NUL
+       del /Q fuzzershell.exe sqldiff.exe 2>NUL
 
 # Dynamic link library section.
 #

diff --git a/main.mk b/main.mk
index 6e0828be95cc19458de68ded4d3b0896265c723e..a58547701c4028fe3343f8c1ac053025fb208194 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -391,7 +391,7 @@ EXTHDR += \
 EXTHDR += \
   $(TOP)/ext/userauth/sqlite3userauth.h
 
-# executabled needed for testing
+# executables needed for testing
 #
 TESTPROGS = \
   testfixture$(EXE) \
@@ -671,6 +671,13 @@ 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
 
+# A very fast test that checks basic sanity.  The name comes from
+# the 60s-era electronics testing:  "Turn it on and see if smoke
+# comes out."
+#
+smoketest:     $(TESTPROGS) fuzzershell$(EXE)
+       ./testfixture$(EXE) $(TOP)/test/main.test
+
 # The next two rules are used to support the "threadtest" target. Building
 # threadtest runs a few thread-safety tests that are implemented in C. This
 # target is invoked by the releasetest.tcl script.
@@ -777,3 +784,5 @@ clean:
        rm -f sqlite3_analyzer sqlite3_analyzer.exe sqlite3_analyzer.c
        rm -f sqlite-*-output.vsix
        rm -f mptester mptester.exe
+       rm -f fuzzershell fuzzershell.exe
+       rm -f sqldiff sqldiff.exe

diff --git a/manifest b/manifest
index 725b9adf2dbe2195386d60d0a26c212301e6e626..fbbd1c1ab5a8fc12886d65e3374fc3f8412e5fec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-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
+C Fix\sminor\sMakefile\stypos.\s\sImprove\sconsistency\sof\sMSVC\smakefile.\s\sAdd\snew\stargets\sto\sclean.
+D 2015-05-11T16:27:33.778
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 13f5add36234e93cbebf9153d3920623ca7fd7ab
+F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 042b52591ab5fe3047e2d37858e77b894f6d0ef0
+F Makefile.msc c65882433fde5f35ff66e759938eaf2dde9f360d
 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 cb55a01d762d7dd6722232b98665843ef93d8d1e
+F main.mk d49723483ee9e4fb71dc2bd0e6be58705a481e73
 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 4e6520159e729b6ea96ccdb14f0ecb00a0ff7cbd
-R efe77b0d0c67edf1e2c0b42f110eae7b
-U drh
-Z 64fd5a5789d465ed8546db070d4d7ca4
+P 1b83f2e7ddfdb488e732731f7a184d37edcad5af
+R 9144e728928711a4d1e8e355f9e1d47b
+U mistachkin
+Z 7fbb5f9bc605e2a68894de61a25f2ba0

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