Add the "valgrind" permutation. This is the same as veryquick.test except that it...

FossilOrigin-Name: 49531300676b303f2ccec8d8d587b389c9eae98b

diff --git a/manifest b/manifest
index 7f58ee2ab47218736ef95227ff4b084649c74ff3..c1f73df7f51b7aba60627e59767fd3e927669053 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\scausing\sfts3\sto\sincorrectly\sreturn\sSQLITE_CORRUPT.
-D 2010-12-02T17:39:26
+C Add\sthe\s"valgrind"\spermutation.\sThis\sis\sthe\ssame\sas\sveryquick.test\sexcept\sthat\sit\somits\sthe\smulti-process\stests\sthat\sdo\snot\swork\sunder\svalgrind.\sNo\schanges\sto\sproduction\sor\sexisting\stest\scode.
+D 2010-12-03T10:32:06
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -524,7 +524,7 @@ F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
-F test/lock_common.tcl 43fef46b1c5b8ac05e382eab214705c23c70bc88
+F test/lock_common.tcl d279887a0ab16cdb6d935c1203e64113c5a000e9
 F test/lookaside.test 382e7bc2fab23d902c8eafb1b9ed7ababfff75a6
 F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
@@ -584,7 +584,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test 193238b7828759805091ecddd9a0912767f236a4
+F test/permutations.test 6c2b9b76b99bf2e9e4abe479f92132f69b69e6e1
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -893,7 +893,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 474196d6452f5868a712a9b0116d5f64c90d67c1
-R adbfa1a9f70157ddb61fd4c028295042
+P 099195b14829f375055345b8322905ccd073d442
+R 12657e4081bbce8f24bac8cf61742cd1
 U dan
-Z ed86013c21e878d00fdc8f86e5e497fd
+Z 711e258ae109ff5e23024862fd405c2d

diff --git a/manifest.uuid b/manifest.uuid
index 8ddf4a5bd428996321ede3bb9e6b078e8222da0b..f85d10db6bc1fc4bb70c84362203049bd0743d06 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-099195b14829f375055345b8322905ccd073d442
\ No newline at end of file
+49531300676b303f2ccec8d8d587b389c9eae98b
\ No newline at end of file

diff --git a/test/lock_common.tcl b/test/lock_common.tcl
index 672f9a5f9596fc759f6b7ff24bf37e48245ff931..21f584264a8a0cefd6074ca8558c2912e4efd4b3 100644 (file)
--- a/test/lock_common.tcl
+++ b/test/lock_common.tcl
@@ -16,6 +16,7 @@
 proc do_multiclient_test {varname script} {
 
   foreach code [list {
+    if {[info exists ::G(valgrind)]} { db close ; continue }
     set ::code2_chan [launch_testfixture]
     set ::code3_chan [launch_testfixture]
     proc code2 {tcl} { testfixture $::code2_chan $tcl }

diff --git a/test/permutations.test b/test/permutations.test
index 5576f5bf392a4a32b47d8c109e497b63260686a1..9dd114ca4708104e74a33d53eec125ae6bd2bba2 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -137,6 +137,17 @@ test_suite "veryquick" -prefix "" -description {
   test_set $allquicktests -exclude *malloc* *ioerr* *fault*
 ]
 
+test_suite "valgrind" -prefix "" -description {
+  Run the "veryquick" test suite with a couple of multi-process tests (that
+  fail under valgrind) omitted.
+} -files [
+  test_set $allquicktests -exclude *malloc* *ioerr* *fault*
+] -initialize {
+  set ::G(valgrind) 1
+} -shutdown {
+  unset -nocomplain ::G(valgrind)
+}
+
 test_suite "quick" -prefix "" -description {
   Quick test suite. Runs in around 10 minutes on a workstation.
 } -files [