Fuzzershell: change the error summary output to work with releasetest.tcl.

Reduce the maximum number of OOM interations.

FossilOrigin-Name: f5e6c4b28d25429aac53ea8cb334a2e6bd821f39
This commit is contained in:
drh 2015-04-25 16:39:49 +00:00
parent f332071b7f
commit 7c84c02ce3
3 changed files with 14 additions and 11 deletions

View File

@ -1,5 +1,5 @@
C Add\sthe\sfuzzoomtest\starget\sto\sthe\smakefiles.\s\sInvoke\sfuzzoomtest\sfrom\nreleasetest.tcl.
D 2015-04-25T13:39:29.321
C Fuzzershell:\schange\sthe\serror\ssummary\soutput\sto\swork\swith\sreleasetest.tcl.\nReduce\sthe\smaximum\snumber\sof\sOOM\sinterations.
D 2015-04-25T16:39:49.474
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in e3268d234210842b4be0a6e2e1c5990999f1d9f4
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 871797988625b34debda280f4aecaa2b8bc84b17
F tool/fuzzershell.c 2799d1e74c48a7fbbfc4889601005d42d1e237a5
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 08ec9f2f5a446774bb8e9b9b0ef463dd5458d28e
R 68dc03c91e8d3010850b75fff4d0681d
P f60657c2ae8a11f1e546c953bca07d9396142f73
R 072fa56265211d86483cda24cb39a8a3
U drh
Z 96fbeeb79fb3935e237bb24fa6fd4a78
Z aa51f9eecc34113bbc64276386380a6e

View File

@ -1 +1 @@
f60657c2ae8a11f1e546c953bca07d9396142f73
f5e6c4b28d25429aac53ea8cb334a2e6bd821f39

View File

@ -87,7 +87,7 @@ struct GlobalVars {
** Maximum number of iterations for an OOM test
*/
#ifndef OOM_MAX
# define OOM_MAX 1000
# define OOM_MAX 625
#endif
/*
@ -734,8 +734,11 @@ int main(int argc, char **argv){
abendError("memory in use after close: %lld bytes", sqlite3_memory_used());
}
if( oomFlag ){
/* Limit the number of iterations of the OOM loop to OOM_MAX. If the
** first pass (single failure) exceeds 2/3rds of OOM_MAX this skip the
** second pass (continuous failure after first) completely. */
if( g.nOomFault==0 || oomCnt>OOM_MAX ){
if( g.bOomOnce ){
if( g.bOomOnce && oomCnt<=(OOM_MAX*2/3) ){
oomCnt = g.iOomCntdown = 1;
g.bOomOnce = 0;
}else{
@ -780,8 +783,8 @@ int main(int argc, char **argv){
}
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());
printf("%s: 0 errors out of %d tests\nSQLite %s %s\n",
g.zArgv0, nTest, sqlite3_libversion(), sqlite3_sourceid());
}
if( zDataOut ){
int n = 0;