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

FossilOrigin-Name: c8893310510148f7e71ede5691606b6fc1c3df4d

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

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

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
 }