From: dan <dan@noemail.net>
Date: Tue, 27 Apr 2010 06:49:34 +0000 (+0000)
Subject: Run trans.test and avtrans.test as part of the "wal" permutation.
X-Git-Tag: version-3.7.2~455^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e106de6317e46efdde1b0d38c2b66f16768706ce;p=thirdparty%2Fsqlite.git

Run trans.test and avtrans.test as part of the "wal" permutation.

FossilOrigin-Name: c8893310510148f7e71ede5691606b6fc1c3df4d
---

diff --git a/manifest b/manifest
index d538e7c77b..d9cabb3bc1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sthat\soccurs\swhen\sone\sprocess\scauses\sthe\slog-summary\sfile\sto\sgrow\sand\sthen\sa\ssecond\sprocess\sattempts\sto\sread\sthe\sdatabase.
-D 2010-04-27T05:42:32
+C Run\strans.test\sand\savtrans.test\sas\spart\sof\sthe\s"wal"\spermutation.
+D 2010-04-27T06:49:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -252,7 +252,7 @@ F test/autoinc.test 85ef3180a737e6580086a018c09c6f1a52759b46
 F test/autoindex1.test ffb06a246e2c1f89cfbe3d93eca513c9e78d4063
 F test/autovacuum.test 25f891bc343a8bf5d9229e2e9ddab9f31a9ab5ec
 F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
-F test/avtrans.test 1e901d8102706b63534dbd2bdd4d8f16c4082650
+F test/avtrans.test 7a26ffc6a355b7fbff2a082f56180ede863b126c
 F test/backup.test b1e874fa9b01de9dd5137a8371d060b76a435162
 F test/backup2.test 159419073d9769fdb1780ed7e5b391a046f898d5
 F test/backup_ioerr.test 1f012e692f42c0442ae652443258f70e9f20fa38
@@ -532,7 +532,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 894a6df3c4394194f84feea8520580dad1b71280
+F test/permutations.test 7d9064978f0ca90d0ec827a7ada9e8e2615b1143
 F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -712,7 +712,7 @@ F test/tkt3997.test a335fa41ca3985660a139df7b734a26ef53284bd
 F test/tkt4018.test 7c2c9ba4df489c676a0a7a0e809a1fb9b2185bd1
 F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/trace.test 4b36a41a3e9c7842151af6da5998f5080cdad9e5
-F test/trans.test d887cb07630dc39879a322d958ad8b006137485c
+F test/trans.test f19bd2c8b5ccc89295454a42b35319b1381b9a3d
 F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
 F test/trans3.test d728abaa318ca364dc370e06576aa7e5fbed7e97
 F test/trigger1.test 2e18561f85e448bb633c9c9de792e9bbf7b2dd3e
@@ -808,7 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7a0ac682c3bffcb345321fe97434563350ac90f9
-R 8f311e98676985c9f340b1e7e337c8e4
+P b51a5f8bc660616aa264025dd7ad4bdab458814b
+R 25f06e3e98c7ea6b1eb255e6fd74be59
 U dan
-Z 70973fdb159f8a0ed7dee7d674e22de0
+Z 9cceaabbad6baa9da4fc7d1b5b1a7fe5
diff --git a/manifest.uuid b/manifest.uuid
index f9a7784eff..dc61bc6fbd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b51a5f8bc660616aa264025dd7ad4bdab458814b
\ No newline at end of file
+c8893310510148f7e71ede5691606b6fc1c3df4d
\ No newline at end of file
diff --git a/test/avtrans.test b/test/avtrans.test
index 328e028c09..4a3514d2b9 100644
--- a/test/avtrans.test
+++ b/test/avtrans.test
@@ -22,8 +22,9 @@ source $testdir/tester.tcl
 # Create several tables to work with.
 #
 do_test avtrans-1.0 {
-  execsql {
-    PRAGMA auto_vacuum=ON;
+  execsql { PRAGMA auto_vacuum=ON }
+  wal_set_journal_mode
+  execsql { 
     CREATE TABLE one(a int PRIMARY KEY, b text);
     INSERT INTO one VALUES(1,'one');
     INSERT INTO one VALUES(2,'two');
@@ -48,6 +49,7 @@ do_test avtrans-1.10 {
   execsql {SELECT b FROM two ORDER BY a} altdb
 } {I V X}
 integrity_check avtrans-1.11
+wal_check_journal_mode avtrans-1.12
 
 # Basic transactions
 #
@@ -84,6 +86,7 @@ do_test avtrans-2.10 {
   }
 } {1 2 3 1 5 10}
 integrity_check avtrans-2.11
+wal_check_journal_mode avtrans-2.12
 
 # Check the locking behavior
 #
@@ -913,9 +916,11 @@ for {set i 2} {$i<=$limit} {incr i} {
         } {1}
       }
     }
+    wal_check_journal_mode avtrans-9.$i-6.$cnt
   }
   set ::pager_old_format 0
 }
 integrity_check avtrans-10.1
+wal_check_journal_mode avtrans-10.2
    
 finish_test
diff --git a/test/permutations.test b/test/permutations.test
index f51cc84422..daf2c72bcb 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -763,9 +763,8 @@ run_tests "wal" -description {
 } -shutdown {
   unset -nocomplain ::savepoint6_iterations
 } -include {
-  savepoint.test
-  savepoint2.test
-  savepoint6.test
+  savepoint.test     savepoint2.test     savepoint6.test
+  trans.test         avtrans.test
 }
 
 # End of tests
diff --git a/test/trans.test b/test/trans.test
index 1965941f8a..cace1218a6 100644
--- a/test/trans.test
+++ b/test/trans.test
@@ -19,6 +19,7 @@ source $testdir/tester.tcl
 
 # Create several tables to work with.
 #
+wal_set_journal_mode
 do_test trans-1.0 {
   execsql {
     CREATE TABLE one(a int PRIMARY KEY, b text);
@@ -46,6 +47,7 @@ do_test trans-1.10 {
   execsql {SELECT b FROM two ORDER BY a} altdb
 } {I V X}
 integrity_check trans-1.11
+wal_check_journal_mode trans-1.12
 
 # Basic transactions
 #
@@ -82,6 +84,7 @@ do_test trans-2.10 {
   }
 } {1 2 3 1 5 10}
 integrity_check trans-2.11
+wal_check_journal_mode trans-2.12
 
 # Check the locking behavior
 #
@@ -162,6 +165,7 @@ do_test trans-3.14 {
   lappend v $msg
 } {0 {1 2 3 4}}
 integrity_check trans-3.15
+wal_check_journal_mode trans-3.16
 
 do_test trans-4.1 {
   set v [catch {execsql {
@@ -228,6 +232,8 @@ do_test trans-4.11 {
   lappend v $msg
 } {0 {1 2 3 4}}
 integrity_check trans-4.12
+wal_check_journal_mode trans-4.13
+wal_check_journal_mode trans-4.14 altdb
 do_test trans-4.98 {
   altdb close
   execsql {
@@ -775,6 +781,7 @@ do_test trans-7.14 {
   execsql {SELECT md5sum(type,name,tbl_name,rootpage,sql) FROM sqlite_master}
 } $checksum2
 integrity_check trans-7.15
+wal_check_journal_mode trans-7.16
 
 # Arrange for another process to begin modifying the database but abort
 # and die in the middle of the modification.  Then have this process read
@@ -824,7 +831,7 @@ do_test trans-8.5 {
   execsql {SELECT md5sum(type,name,tbl_name,rootpage,sql) FROM sqlite_master}
 } $checksum2
 integrity_check trans-8.6
-
+wal_check_journal_mode trans-8.7
 
 # In the following sequence of tests, compute the MD5 sum of the content
 # of a table, make lots of modifications to that table, then do a rollback.
@@ -854,6 +861,7 @@ do_test trans-9.1 {
     SELECT count(*) FROM t3;
   }
 } {1024}
+wal_check_journal_mode trans-9.1.1
 
 # The following procedure computes a "signature" for table "t3".  If
 # T3 changes in any way, the signature should change.  
@@ -940,6 +948,8 @@ for {set i 2} {$i<=$limit} {incr i} {
       }
     }
   }
+
+  wal_check_journal_mode trans-9.$i.6-$cnt
   set ::pager_old_format 0
 }