mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fuzzcheck so that it works with SQLITE_OMIT_PROGRESS_CALLBACK.

Browse Source 
FossilOrigin-Name: 7a9c4eb30e6a834da20931b535c2894837d7d5d7
This commit is contained in:
drh 2015-06-24 23:17:35 +00:00
parent 619a111e05
commit 780573510b
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifest
View File

@ -1,5 +1,5 @@
C Add\s"ON\sCONFLICT"\shandling\sto\sthe\sspellfix\smodule.
D 2015-06-24T18:22:51.190
C Fix\sfuzzcheck\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_PROGRESS_CALLBACK.
D 2015-06-24T23:17:35.758
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -657,7 +657,7 @@ F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
F test/fuzz3.test efd384b896c647b61a2c1848ba70d42aad60a7b3
F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
F test/fuzzcheck.c 15f1293200aefcba30ff7720f5e3c28ef459c61c
F test/fuzzcheck.c d1f1e5e6e121852f8945024047d23ed8d93cedbc
F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
F test/fuzzdata3.db b83d0c20ae64113432c03d40c06ba473a4cb696b
@ -1286,8 +1286,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P fbf9c4325e98120914bb03bdf351b57643f7a8c8 1d04def785b6031de68b7f199d400cbb5c76caea
R de10737ebdc70bb8182e7abe767d84f9
T +closed 1d04def785b6031de68b7f199d400cbb5c76caea
P 07937a81c6c90eb7491a843eb65183805f5b675e
R 5cc0fa90b0ff0423f95bf08eb9e98517
U drh
Z eeb6ef6607f26af62ae9a0b6e717ca6b
Z d84e60857a238f6ff0f0ddefa37726a4

2
manifest.uuid
View File

@ -1 +1 @@
07937a81c6c90eb7491a843eb65183805f5b675e
7a9c4eb30e6a834da20931b535c2894837d7d5d7

4
test/fuzzcheck.c
View File

@ -166,6 +166,7 @@ static void setAlarm(int N){
#endif
}
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
/*
** This an SQL progress handler. After an SQL statement has run for
** many steps, we want to interrupt it. This guards against infinite
@ -178,6 +179,7 @@ static int progressHandler(void *pVdbeLimitFlag){
if( *(int*)pVdbeLimitFlag ) fatalError("too many VDBE cycles");
return 1;
}
#endif
/*
** Reallocate memory. Show and error and quit if unable.
@ -958,9 +960,11 @@ int main(int argc, char **argv){
if( rc ) fatalError("cannot open inmem database");
if( cellSzCkFlag ) runSql(db, "PRAGMA cell_size_check=ON", runFlags);
setAlarm(10);
#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
if( sqlFuzz || vdbeLimitFlag ){
sqlite3_progress_handler(db, 100000, progressHandler, &vdbeLimitFlag);
}
#endif
do{
runSql(db, (char*)pSql->a, runFlags);
}while( timeoutTest );