Fix fuzzershell so that it works with SQLITE_OMIT_TRACE.

FossilOrigin-Name: dc88fe7e641c52d27fba8c753cee590db87388c5

diff --git a/Makefile.in b/Makefile.in
index cc2dbfc3189ea4335b52a05f099c6a003390db41..eabe86ce376009d93e014100f01be7ab238cc1d1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -983,7 +983,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)
+smoketest:     testfixture$(TEXE) fuzzershell$(TEXE)
        ./testfixture$(TEXE) $(TOP)/test/main.test
 
 sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl

diff --git a/manifest b/manifest
index 57b60093216cb754dd031511c92d27c96fafa6a8..d8496c7409134472a236a79d3e47dd6b33caf39d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Add\sthe\s--with-tcl=DIR\soption\sto\sthe\stest/releasetest.tcl\sscript.
-D 2015-04-24T17:50:37.253
+C Fix\sfuzzershell\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_TRACE.
+D 2015-04-24T18:31:12.676
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in e25a3b8036f49bc0a08694b7a41ee0913d60f4e5
+F Makefile.in 31b38b9da2e4b36f54a013bd71a5c3f6e45ca78f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc 4a546e42ecfd0fe53c31e05c2a965e17fb591637
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -1205,7 +1205,7 @@ F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
 F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
-F tool/fuzzershell.c 0a260bf9bbf33d4534834167c30f812cd8fdf7c8
+F tool/fuzzershell.c a13c48cb83bbea8966442d777e14595b87023701
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
@@ -1253,7 +1253,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 0bb96a037bd7179cb3a6137bb29827fc7d72ec3f
-R 490f17d8f0cbe5def4bfbb0990513b33
+P 4dda916a572bcb54c8cf3b81d965328632a722eb
+R fafcb3fcae40447c0604a45203b7a18d
 U drh
-Z 0a587d9a322583805c3550241286812f
+Z 443a2106b8aed7f08a3ed861aaf1e388

diff --git a/manifest.uuid b/manifest.uuid
index 8fbf34353fb35aafd678f21e07e22d75ec013387..f42387d8b96f916242e0fd4ebbc3694f54ec9986 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4dda916a572bcb54c8cf3b81d965328632a722eb
\ No newline at end of file
+dc88fe7e641c52d27fba8c753cee590db87388c5
\ No newline at end of file

diff --git a/tool/fuzzershell.c b/tool/fuzzershell.c
index 029238358a70249e22b0fe5c8582c6ad531a3139..51f1a636604e6816ce338767b47204d0a42b8662 100644 (file)
--- a/tool/fuzzershell.c
+++ b/tool/fuzzershell.c
@@ -147,6 +147,7 @@ static int execNoop(void *NotUsed, int argc, char **argv, char **colv){
   return 0;
 }
 
+#ifndef SQLITE_OMIT_TRACE
 /*
 ** This callback is invoked by sqlite3_trace() as each SQL statement
 ** starts.
@@ -154,6 +155,7 @@ static int execNoop(void *NotUsed, int argc, char **argv, char **colv){
 static void traceCallback(void *NotUsed, const char *zMsg){
   printf("TRACE: %s\n", zMsg);
 }
+#endif
 
 /***************************************************************************
 ** eval() implementation copied from ../ext/misc/eval.c
@@ -576,7 +578,9 @@ int main(int argc, char **argv){
       }
       sqlite3_backup_finish(pBackup);
     }
+#ifndef SQLITE_OMIT_TRACE
     if( verboseFlag ) sqlite3_trace(db, traceCallback, 0);
+#endif
     sqlite3_create_function(db, "eval", 1, SQLITE_UTF8, 0, sqlEvalFunc, 0, 0);
     sqlite3_create_function(db, "eval", 2, SQLITE_UTF8, 0, sqlEvalFunc, 0, 0);
     sqlite3_limit(db, SQLITE_LIMIT_LENGTH, 1000000);