Add the fuzzoomtest target to the makefiles. Invoke fuzzoomtest from

releasetest.tcl.

FossilOrigin-Name: f60657c2ae8a11f1e546c953bca07d9396142f73

diff --git a/Makefile.in b/Makefile.in
index eabe86ce376009d93e014100f01be7ab238cc1d1..116f117bbb12a61ae576c8018cb5c860bd9de77c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -955,7 +955,7 @@ fulltest:   testfixture$(TEXE) sqlite3$(TEXE) fuzztest
        ./testfixture$(TEXE) $(TOP)/test/all.test
 
 # Really really long testing
-soaktest:      testfixture$(TEXE) sqlite3$(TEXE)
+soaktest:      testfixture$(TEXE) sqlite3$(TEXE) fuzzoomtest
        ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
 
 # Do extra testing but not aeverything.
@@ -966,6 +966,9 @@ fulltestonly:       testfixture$(TEXE) sqlite3$(TEXE)
 fuzztest:      fuzzershell$(TEXE)
        ./fuzzershell$(TEXE) -f $(TOP)/test/fuzzdata1.txt
 
+fuzzoomtest:   fuzzershell$(TEXE)
+       ./fuzzershell$(TEXE) -f $(TOP)/test/fuzzdata1.txt --oom
+
 # This is the common case.  Run many tests but not those that take
 # a really long time.
 #

diff --git a/Makefile.msc b/Makefile.msc
index 30468d4854631a04ceebb04709259976425bcd87..cb9c0cb15a5d70eb537428fae5096edca603bd31 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1627,7 +1627,7 @@ extensiontest: testfixture.exe testloadext.dll
 fulltest:      testfixture.exe sqlite3.exe fuzztest
        .\testfixture.exe $(TOP)\test\all.test
 
-soaktest:      testfixture.exe sqlite3.exe
+soaktest:      testfixture.exe sqlite3.exe fuzzoomtest
        .\testfixture.exe $(TOP)\test\all.test -soak=1
 
 fulltestonly:  testfixture.exe sqlite3.exe fuzztest
@@ -1639,6 +1639,9 @@ queryplantest:    testfixture.exe sqlite3.exe
 fuzztest:      fuzzershell.exe
        .\fuzzershell.exe -f $(TOP)\test\fuzzdata1.txt
 
+fuzzoomtest:   fuzzershell.exe
+       .\fuzzershell.exe -f $(TOP)\test\fuzzdata1.txt --oom
+
 test:  testfixture.exe sqlite3.exe fuzztest
        .\testfixture.exe $(TOP)\test\veryquick.test
 

diff --git a/main.mk b/main.mk
index f06488e6f58c3bdbb4488658cae6132f37935d73..6c73fa4943d1be7188fae2820586c09061559beb 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -636,7 +636,7 @@ fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
 fulltest:      testfixture$(EXE) sqlite3$(EXE) fuzztest
        ./testfixture$(EXE) $(TOP)/test/all.test
 
-soaktest:      testfixture$(EXE) sqlite3$(EXE)
+soaktest:      testfixture$(EXE) sqlite3$(EXE) fuzzoomtest
        ./testfixture$(EXE) $(TOP)/test/all.test -soak=1
 
 fulltestonly:  testfixture$(EXE) sqlite3$(EXE) fuzztest
@@ -648,6 +648,9 @@ queryplantest:      testfixture$(EXE) sqlite3$(EXE)
 fuzztest:      fuzzershell$(EXE)
        ./fuzzershell$(EXE) -f $(TOP)/test/fuzzdata1.txt
 
+fuzzoomtest:   fuzzershell$(EXE)
+       ./fuzzershell$(EXE) -f $(TOP)/test/fuzzdata1.txt --oom
+
 test:  testfixture$(EXE) sqlite3$(EXE) fuzztest
        ./testfixture$(EXE) $(TOP)/test/veryquick.test
 

diff --git a/manifest b/manifest
index 41da130fc09f520c10a180e524c36be8b795c651..1f287e80801b1795631a2f57f752bb538c4f3897 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\san\sobscure\smemory\sleak\sthat\scould\sfollow\san\sOOM\sin\swhere.c.
-D 2015-04-25T12:20:24.152
+C Add\sthe\sfuzzoomtest\starget\sto\sthe\smakefiles.\s\sInvoke\sfuzzoomtest\sfrom\nreleasetest.tcl.
+D 2015-04-25T13:39:29.321
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 31b38b9da2e4b36f54a013bd71a5c3f6e45ca78f
+F Makefile.in e3268d234210842b4be0a6e2e1c5990999f1d9f4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 4a546e42ecfd0fe53c31e05c2a965e17fb591637
+F Makefile.msc 0f859a8bbda8b3876ed2f257281db26ba9ad8398
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@ -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 b8996b5919fd0781417b1c2305f4a7ea18b2220d
+F main.mk c0c7503b9749c1532c1e0e9501331abc1afc299d
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -814,7 +814,7 @@ F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl f649253610c8b0b0d63ad85b0d2961867d4f0ac0
+F test/releasetest.tcl 7ad4fd49ae50c41ec7781815bdda8a8b278781d4
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -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 4d87082924b010c7b2c89e1bb01332a5cab8289a
+F tool/fuzzershell.c 871797988625b34debda280f4aecaa2b8bc84b17
 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 b7394755fab81329d56bad1b506e536b2fcbe8cd
-R ffe242310eb47eb26efd0e21515d48b5
-U dan
-Z d148d9794c2520483b80e18ea41d6bd5
+P 08ec9f2f5a446774bb8e9b9b0ef463dd5458d28e
+R 68dc03c91e8d3010850b75fff4d0681d
+U drh
+Z 96fbeeb79fb3935e237bb24fa6fd4a78

diff --git a/manifest.uuid b/manifest.uuid
index 08007bad1c30d81be8550c09043a7ed6bcd3cc98..54cb8988f1316d2c566d90d532dbda2727d89b9b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08ec9f2f5a446774bb8e9b9b0ef463dd5458d28e
\ No newline at end of file
+f60657c2ae8a11f1e546c953bca07d9396142f73
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 9cd30e195dd4d9f24e8ccde387a26dbed27986f1..a429d83cab1275da83457c62fe83043c86396df6 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -111,6 +111,13 @@ array set ::Configs [strip_comments {
     -DSQLITE_ENABLE_STAT4
     -DSQLITE_MAX_ATTACHED=125
   }
+  "Fast-One" {
+    -O6
+    -DSQLITE_ENABLE_FTS4=1
+    -DSQLITE_ENABLE_RTREE=1
+    -DSQLITE_ENABLE_STAT4
+    -DSQLITE_MAX_ATTACHED=125
+  }
   "Device-One" {
     -O2
     -DSQLITE_DEBUG=1
@@ -217,6 +224,7 @@ array set ::Platforms [strip_comments {
     "No-lookaside"            test
     "Devkit"                  test
     "Sanitize"                {QUICKTEST_OMIT=func4.test,nan.test test}
+    "Fast-One"                fuzzoomtest
     "Valgrind"                valgrindtest
     "Default"                 "threadtest fulltest"
     "Device-One"              fulltest
@@ -653,10 +661,11 @@ proc main {argv} {
     # it and run veryquick.test. If it did not include the SQLITE_DEBUG option
     # add it and run veryquick.test.
     if {$target!="checksymbols" && $target!="valgrindtest"
-           && !$::BUILDONLY && $::QUICK<2} {
+           && $target!="fuzzoomtest" && !$::BUILDONLY && $::QUICK<2} {
       set debug_idx [lsearch -glob $config_options -DSQLITE_DEBUG*]
       set xtarget $target
       regsub -all {fulltest[a-z]*} $xtarget test xtarget
+      regsub -all {fuzzoomtest} $xtarget fuzztest xtarget
       if {$debug_idx < 0} {
         incr NTEST
         append config_options " -DSQLITE_DEBUG=1"

diff --git a/tool/fuzzershell.c b/tool/fuzzershell.c
index d4a5acfbe3919f82b884d51a3583b5ba1b7958a5..f2f493059df2f074e8a5ad30799b258d7158cce0 100644 (file)
--- a/tool/fuzzershell.c
+++ b/tool/fuzzershell.c
@@ -39,8 +39,8 @@
 **
 **       |****<...>****|
 **
-** where the "..." is arbitrary text, except the "|" should really be "/".
-** ("|" is used here to avoid compiler errors about nested comments.)
+** where the "..." is arbitrary text. (Except the "|" should really be "/".
+** "|" is used here to avoid compiler errors about nested comments.)
 ** A separate in-memory SQLite database is created to run each test case.
 ** This feature allows the "queue" of AFL to be captured into a single big
 ** file using a command like this:
@@ -60,7 +60,6 @@
 ** test cases are added, they can be eliminated by running:
 **
 **    fuzzershell -f ~/all-queue.txt --unique-cases ~/unique-cases.txt
-**
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -84,6 +83,13 @@ struct GlobalVars {
   char zTestName[100];             /* Name of current test */
 } g;
 
+/*
+** Maximum number of iterations for an OOM test
+*/
+#ifndef OOM_MAX
+# define OOM_MAX 1000
+#endif
+
 /*
 ** This routine is called when a simulated OOM occurs.  It exists as a
 ** convenient place to set a debugger breakpoint.
@@ -615,7 +621,7 @@ int main(int argc, char **argv){
       if( z ){
         z += 6;
         sqlite3_snprintf(sizeof(g.zTestName), g.zTestName, "%.*s", 
-                         (int)(z-&zIn[i]), &zIn[i]);
+                         (int)(z-&zIn[i]) - 12, &zIn[i+6]);
         if( verboseFlag ){
           printf("%.*s\n", (int)(z-&zIn[i]), &zIn[i]);
           fflush(stdout);
@@ -642,16 +648,19 @@ int main(int argc, char **argv){
     if( verboseFlag ){
       printf("INPUT (offset: %d, size: %d): [%s]\n",
               i, (int)strlen(&zIn[i]), &zIn[i]);
-      fflush(stdout);
     }else if( multiTest && !quietFlag ){
-      int pct = oomFlag ? 100*iNext/nIn : ((10*iNext)/nIn)*10;
-      if( pct!=lastPct ){
-        if( lastPct<0 ) printf("fuzz test:");
-        printf(" %d%%", pct);
-        fflush(stdout);
-        lastPct = pct;
+      if( oomFlag ){
+        printf("%s\n", g.zTestName);
+      }else{
+        int pct = (10*iNext)/nIn;
+        if( pct!=lastPct ){
+          if( lastPct<0 ) printf("fuzz test:");
+          printf(" %d%%", pct*10);
+          lastPct = pct;
+        }
       }
     }
+    fflush(stdout);
     switch( iMode ){
       case FZMODE_Glob:
         zSql = zToFree = sqlite3_mprintf("SELECT glob(%s);", zSql);
@@ -725,7 +734,7 @@ int main(int argc, char **argv){
         abendError("memory in use after close: %lld bytes", sqlite3_memory_used());
       }
       if( oomFlag ){
-        if( g.nOomFault==0 || oomCnt>2000 ){
+        if( g.nOomFault==0 || oomCnt>OOM_MAX ){
           if( g.bOomOnce ){
             oomCnt = g.iOomCntdown = 1;
             g.bOomOnce = 0;
@@ -769,7 +778,7 @@ int main(int argc, char **argv){
       }
     }
   }
-  if( !verboseFlag && multiTest && !quietFlag ) printf("\n");
+  if( !verboseFlag && multiTest && !quietFlag && !oomFlag ) printf("\n");
   if( nTest>1 && !quietFlag ){
     printf("%d fuzz tests with no errors\nSQLite %s %s\n",
            nTest, sqlite3_libversion(), sqlite3_sourceid());