From: drh Date: Wed, 7 Jan 2015 14:09:41 +0000 (+0000) Subject: Add a valgrind test to the Linux-x86_64 platform in releasetest.tcl. X-Git-Tag: version-3.8.8~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a2a0f560e129f012602f8a88de91d9833e008e7;p=thirdparty%2Fsqlite.git Add a valgrind test to the Linux-x86_64 platform in releasetest.tcl. FossilOrigin-Name: 4b6df035561add4e304fb56dd70ae4d413d6bd5d --- diff --git a/Makefile.in b/Makefile.in index f9974d609b..7cf30bd617 100644 --- a/Makefile.in +++ b/Makefile.in @@ -943,6 +943,9 @@ fulltestonly: testfixture$(TEXE) sqlite3$(TEXE) test: testfixture$(TEXE) sqlite3$(TEXE) ./testfixture$(TEXE) $(TOP)/test/veryquick.test +valgrindtest: testfixture sqlite3 + valgrind -v ./testfixture $(TOP)/test/permutations.test valgrind + sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl echo "#define TCLSH 2" > $@ cat sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c >> $@ diff --git a/manifest b/manifest index b0a012638e..87287d687c 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C Fix\sa\sproblem\sin\sthe\sunix\simplementation\sof\sFCNTL_SIZE_HINT\son\ssystems\sthat\sdo\snot\ssupport\sposix_fallocate(). -D 2015-01-06T21:31:47.399 +C Add\sa\svalgrind\stest\sto\sthe\sLinux-x86_64\splatform\sin\sreleasetest.tcl. +D 2015-01-07T14:09:41.228 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 335e2d3ff0f2455eacbfa3075fc37495e3321410 +F Makefile.in f33d4a67b9471dd46283e0a3d61b0fdd763881ef F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09 F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 @@ -801,7 +801,7 @@ F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df F test/rdonly.test dd30a4858d8e0fbad2304c2bd74a33d4df36412a F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254 -F test/releasetest.tcl fcdb3fb8a84218cbc0d8d65c00375851e05d1966 +F test/releasetest.tcl 0c48488235152e5e1fff0a9799e0c0783575c3d7 F test/resolver01.test 33abf37ff8335e6bf98f2b45a0af3e06996ccd9a F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14 @@ -1235,7 +1235,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 6917d9f437224229fa103c847c2df87ade64e1e9 -R 0111aab44e1e45e62cc43cdb1ef5ac44 -U dan -Z 3770b6339e7a7811d980a8c39cc67da5 +P af20eae1e6f608e4e61a07c3d14cf88c12751353 +R e86fb760bae561a09a9e3d3b43363ec9 +U drh +Z 86d9cb70a3b84146b850d94589825104 diff --git a/manifest.uuid b/manifest.uuid index 4550f6b084..a15217c001 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -af20eae1e6f608e4e61a07c3d14cf88c12751353 \ No newline at end of file +4b6df035561add4e304fb56dd70ae4d413d6bd5d \ No newline at end of file diff --git a/test/releasetest.tcl b/test/releasetest.tcl index 24665f6f67..afcde27fd7 100644 --- a/test/releasetest.tcl +++ b/test/releasetest.tcl @@ -155,12 +155,16 @@ array set ::Configs { -DSQLITE_DISABLE_FTS4_DEFERRED -DSQLITE_ENABLE_RTREE } - "No-lookaside" { -DSQLITE_TEST_REALLOC_STRESS=1 -DSQLITE_OMIT_LOOKASIDE=1 -DHAVE_USLEEP=1 } + "Valgrind" { + -DSQLITE_ENABLE_STAT4 + -DSQLITE_ENABLE_FTS4 + -DSQLITE_ENABLE_RTREE + } } array set ::Platforms { @@ -172,10 +176,11 @@ array set ::Platforms { "Update-Delete-Limit" test "Extra-Robustness" test "Device-Two" test - "Ftrapv" test - "Sanitize" {QUICKTEST_OMIT=func4.test,nan.test test} "No-lookaside" test "Devkit" test + "Ftrapv" test + "Sanitize" {QUICKTEST_OMIT=func4.test,nan.test test} + "Valgrind" valgrindtest "Default" "threadtest fulltest" "Device-One" fulltest } @@ -243,6 +248,13 @@ proc count_tests_and_errors {logfile rcVar errmsgVar} { set errmsg $msg } } + if {[regexp {ERROR SUMMARY: (\d+) errors.*} $line all cnt] && $cnt>0} { + incr ::NERRCASE + if {$rc==0} { + set rc 1 + set errmsg $all + } + } } close $fd if {!$seen} { @@ -328,7 +340,7 @@ proc configureCommand {} { if {$::tcl_platform(platform)=="windows"} { lappend result sh } - lappend result $::SRCDIR/configure -enable-load-extension >& test.log + lappend result $::SRCDIR/configure --enable-load-extension >& test.log } # The following procedure returns the "make" command to be executed for the @@ -478,7 +490,7 @@ proc main {argv} { # If the configuration included the SQLITE_DEBUG option, then remove # it and run veryquick.test. If it did not include the SQLITE_DEBUG option # add it and run veryquick.test. - if {$target!="checksymbols" && !$::BUILDONLY} { + if {$target!="checksymbols" && $target!="valgrindtest" && !$::BUILDONLY} { set debug_idx [lsearch -glob $config_options -DSQLITE_DEBUG*] set xtarget $target regsub -all {fulltest[a-z]*} $xtarget test xtarget