From: drh <drh@noemail.net>
Date: Fri, 7 May 2010 00:28:41 +0000 (+0000)
Subject: Another attempt to fix permutations.test so that it excludes WAL tests
X-Git-Tag: version-3.7.2~404
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c47d194a2822320464b20a34b158fd66ba03ce6;p=thirdparty%2Fsqlite.git

Another attempt to fix permutations.test so that it excludes WAL tests
from the journaltest permutation.

FossilOrigin-Name: 58c404429c5af167a82899fc4c736ed7489ed746
---

diff --git a/manifest b/manifest
index 7b51b36c53..bbdc439efa 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Remove\ssavepoint6.test\sfrom\sthe\sset\sof\stests\srun\sby\sjournaltest\ssince\s\nsavepoint6.test\suses\sjournal_mode=WAL.
-D 2010-05-06T22:21:15
+C Another\sattempt\sto\sfix\spermutations.test\sso\sthat\sit\sexcludes\sWAL\stests\nfrom\sthe\sjournaltest\spermutation.
+D 2010-05-07T00:28:42
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -538,7 +538,7 @@ F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test 0c622a8dcedff5e35ffa06dfd7cdbbe701da2022
+F test/permutations.test 8923516a21e6ab0874ce4887291fe1424c01dc2c
 F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -816,14 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c3520460a4a39fc5e981c3033068ffbb422a4af2
-R 118ff2cc5f44b1b5acfee850b01f73f1
+P 811b45a96bfaa0ef2394b86c06e8f099a07ee9f0
+R 86299c21c6b7c96511458b543a038b2b
 U drh
-Z 2b5260f09b04749559e1196b196a9ad7
+Z 955a03d25a22bc09c41733cf5408d2c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFL40DdoxKgR168RlERAlB8AKCBFLr2Qyq4/S/HNHNXxREW2IHcDwCZASPy
-PewDBZsR5grCiZnDdEWr8bo=
-=tKeW
+iD8DBQFL4169oxKgR168RlERAnrsAKCEurphxxmP4z1X/wpd1I5NfcQkeQCfX725
+NpjK+Obd7+EnT1wjfvpufRg=
+=Jigv
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index d53d34d7bb..598dbc7efd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-811b45a96bfaa0ef2394b86c06e8f099a07ee9f0
\ No newline at end of file
+58c404429c5af167a82899fc4c736ed7489ed746
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index ec16fd0701..177440714b 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -83,7 +83,7 @@ foreach filename [glob $testdir/*.test] {
 set ALLTESTS [lsort $ALLTESTS]
 set WALTESTS [list]
 foreach filename $ALLTESTS {
-  if {![regexp {^wal} $filename]} {lappend WALTESTS $filename}
+  if {[regexp {^wal} $filename]} {lappend WALTESTS $filename}
 }
 
 rename finish_test really_finish_test2
@@ -736,8 +736,7 @@ run_tests "journaltest" -description {
 } -shutdown {
   #sqlite3_instvfs destroy binarylog
   unregister_jt_vfs
-} -include [concat $::ALLTESTS savepoint6.test
-] -exclude [concat $::WALTESTS {
+} -include $::ALLTESTS -exclude [concat $::WALTESTS {
   incrvacuum.test
   ioerr.test
   corrupt4.test