In the fuzzershell, always invoke the trace and log callbacks even if output

is suppressed.  Keep track of the current test name in a global variable
for simplified debugging.

FossilOrigin-Name: 3045f454817f657df801358c40c665b0b0d73c1f

diff --git a/manifest b/manifest
index 22973f94c4fa7ca8ce18741c81c599e08b755a44..c63cdd8b8c4def3e175e9e6a79b6867bd5004a16 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\ssend\sthe\sextra\s";"\sand\s"\\000"\stokens\sto\sthe\sparser\sif\sa\sprior\serror\nhas\soccurred.
-D 2015-04-25T00:32:30.368
+C In\sthe\sfuzzershell,\salways\sinvoke\sthe\strace\sand\slog\scallbacks\seven\sif\soutput\nis\ssuppressed.\s\sKeep\strack\sof\sthe\scurrent\stest\sname\sin\sa\sglobal\svariable\nfor\ssimplified\sdebugging.
+D 2015-04-25T11:19:51.094
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 31b38b9da2e4b36f54a013bd71a5c3f6e45ca78f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -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 2c43450b64facf45668c13757bccf104370bbbde
+F tool/fuzzershell.c 176b6012f843c0a0f30a4f55c4bb9de6dbc0225d
 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 2b98a25237d1b3e64aec2772b622e8b3be2df454
-R 1845152f55b1ee59daa60e6bac40340e
+P 9aa70ddf2ca6044634560a801b43df121384eb64
+R e57acda28e13513e1a84ebb724d11baf
 U drh
-Z ee49a39b84a8bd70ced442059a45b915
+Z 793f5b4972bee92c375b2bfc0ff9f6be

diff --git a/manifest.uuid b/manifest.uuid
index 1cd93289c52256096ea0f4356bf93996188dd295..689c735e09f4daa85eba06dcacfef2a4fe7bda9c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9aa70ddf2ca6044634560a801b43df121384eb64
\ No newline at end of file
+3045f454817f657df801358c40c665b0b0d73c1f
\ No newline at end of file

diff --git a/tool/fuzzershell.c b/tool/fuzzershell.c
index 5ac2e482ebcd920bad20964df4eb318075248701..ff2125d0c665cf5461dcf7d00c75a614e3d5a93a 100644 (file)
--- a/tool/fuzzershell.c
+++ b/tool/fuzzershell.c
@@ -79,6 +79,7 @@ struct GlobalVars {
   int bOomOnce;                    /* Fail just once if true */
   int bOomEnable;                  /* True to enable OOM simulation */
   int nOomBrkpt;                   /* Number of calls to oomFault() */
+  char zTestName[100];             /* Name of current test */
 } g;
 
 /*
@@ -166,6 +167,9 @@ static void shellLog(void *pNotUsed, int iErrCode, const char *zMsg){
   printf("LOG: (%d) %s\n", iErrCode, zMsg);
   fflush(stdout);
 }
+static void shellLogNoop(void *pNotUsed, int iErrCode, const char *zMsg){
+  return;
+}
 
 /*
 ** This callback is invoked by sqlite3_exec() to return query results.
@@ -198,6 +202,9 @@ static void traceCallback(void *NotUsed, const char *zMsg){
   printf("TRACE: %s\n", zMsg);
   fflush(stdout);
 }
+static void traceNoop(void *NotUsed, const char *zMsg){
+  return;
+}
 #endif
 
 /***************************************************************************
@@ -525,7 +532,7 @@ int main(int argc, char **argv){
       abendError("unknown argument: %s", argv[i]);
     }
   }
-  if( verboseFlag ) sqlite3_config(SQLITE_CONFIG_LOG, shellLog, 0);
+  sqlite3_config(SQLITE_CONFIG_LOG, verboseFlag ? shellLog : shellLogNoop, 0);
   if( nHeap>0 ){
     pHeap = malloc( nHeap );
     if( pHeap==0 ) fatalError("cannot allocate %d-byte heap\n", nHeap);
@@ -597,6 +604,8 @@ int main(int argc, char **argv){
       char *z = strstr(&zIn[i], ">****/");
       if( z ){
         z += 6;
+        sqlite3_snprintf(sizeof(g.zTestName), g.zTestName, "%.*", 
+                         (int)(z-&zIn[i]), &zIn[i]);
         if( verboseFlag ){
           printf("%.*s\n", (int)(z-&zIn[i]), &zIn[i]);
           fflush(stdout);
@@ -678,7 +687,7 @@ int main(int argc, char **argv){
         sqlite3_backup_finish(pBackup);
       }
   #ifndef SQLITE_OMIT_TRACE
-      if( verboseFlag ) sqlite3_trace(db, traceCallback, 0);
+      sqlite3_trace(db, verboseFlag ? traceCallback : traceNoop, 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);