From: dan <dan@noemail.net>
Date: Mon, 11 Apr 2016 19:23:36 +0000 (+0000)
Subject: Add tests for wal mode to temptable2.test.
X-Git-Tag: version-3.13.0~53^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5a2592a9e1625b84b975d2bfbd2b8587bf58185;p=thirdparty%2Fsqlite.git

Add tests for wal mode to temptable2.test.

FossilOrigin-Name: c6d0d441a1ab4873caedf2f23543444cea5d7f5a
---

diff --git a/manifest b/manifest
index d5aafb59c4..017d301d54 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
-D 2016-04-11T18:50:25.500
+C Add\stests\sfor\swal\smode\sto\stemptable2.test.
+D 2016-04-11T19:23:36.940
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@@ -1111,7 +1111,7 @@ F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
 F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 F test/tempfault.test 0c80f23c651cf6452c27cacf09f4c2ee9527a912
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
-F test/temptable2.test f04c411560dadebcc44aba631c602c908dfe1dd8
+F test/temptable2.test 79a30edb79c4d5a4916f208f97935a70efd4b3ba
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
 F test/tester.tcl 7b740ee852c55e1e72b6ebe5044acee7aa4e5553
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
@@ -1484,7 +1484,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7dd9d4c15bb6b6ef9127dc7c80a189c55e714dc9 2764aeaa11f38cf2ff4d6191e6d5466ddb203022
-R 7b4c1f71edaf782a86682a72496a355b
+P ffc62af1d503c6e7fc0059d9c2ee57a3bef9dd32
+R b5aaac24011d4d477c13603957856121
 U dan
-Z 4c9d4d3f9ec993332df2230efd24eb4f
+Z 91cb540a3f9a28d737c21f7feeaff7cc
diff --git a/manifest.uuid b/manifest.uuid
index 0dd130d179..fa8dceac08 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffc62af1d503c6e7fc0059d9c2ee57a3bef9dd32
\ No newline at end of file
+c6d0d441a1ab4873caedf2f23543444cea5d7f5a
\ No newline at end of file
diff --git a/test/temptable2.test b/test/temptable2.test
index af566ab529..44a148ddfb 100644
--- a/test/temptable2.test
+++ b/test/temptable2.test
@@ -272,38 +272,47 @@ tmp close
 #-------------------------------------------------------------------------
 # Try inserts and deletes with a large db in auto-vacuum mode. Check
 #
-reset_db
-do_execsql_test 9.1 {
-  PRAGMA cache_size = 15;
-  CREATE TABLE tx(a, b);
-  CREATE INDEX i1 ON tx(a);
-  CREATE INDEX i2 ON tx(b);
+foreach {tn mode} {
+  1 delete
+  2 wal
+} {
+  reset_db
+  do_execsql_test 9.$tn.1.1 {
+    PRAGMA cache_size = 15;
+    PRAGMA auto_vacuum = 1;
+  }
+  do_execsql_test 9.$tn.1.2 "PRAGMA journal_mode = $mode" $mode
 
-  WITH x(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM x WHERE i<1000 )
-  INSERT INTO tx SELECT randomblob(100), randomblob(100) FROM x;
-}
-for {set i 2} {$i<20} {incr i} {
+  do_execsql_test 9.$tn.1.3 {
+    CREATE TABLE tx(a, b);
+    CREATE INDEX i1 ON tx(a);
+    CREATE INDEX i2 ON tx(b);
+    WITH x(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM x WHERE i<1000 )
+      INSERT INTO tx SELECT randomblob(100), randomblob(100) FROM x;
+  }
 
-  do_execsql_test 9.$i.1 { DELETE FROM tx WHERE (random()%3)==0 }
+  for {set i 2} {$i<20} {incr i} {
+    do_execsql_test 9.$tn.$i.1 { DELETE FROM tx WHERE (random()%3)==0 }
 
-  do_execsql_test 9.$i.2 { PRAGMA integrity_check } ok
+    do_execsql_test 9.$tn.$i.2 { PRAGMA integrity_check } ok
 
-  do_execsql_test 9.$i.3 { 
-    WITH x(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM x WHERE i<400 )
-      INSERT INTO tx SELECT randomblob(100), randomblob(100) FROM x;
-  }
+      do_execsql_test 9.$tn.$i.3 { 
+        WITH x(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM x WHERE i<400 )
+          INSERT INTO tx SELECT randomblob(100), randomblob(100) FROM x;
+      }
 
-  do_execsql_test 9.$i.4 { PRAGMA integrity_check } ok
+    do_execsql_test 9.$tn.$i.4 { PRAGMA integrity_check } ok
 
-  do_execsql_test 9.$i.5 { 
-    BEGIN;
+    do_execsql_test 9.$tn.$i.5 { 
+      BEGIN;
       DELETE FROM tx WHERE (random()%3)==0;
       WITH x(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM x WHERE i<500 )
         INSERT INTO tx SELECT randomblob(100), randomblob(100) FROM x;
-    COMMIT;
-  }
+      COMMIT;
+    }
 
-  do_execsql_test 9.$i.6 { PRAGMA integrity_check } ok
+    do_execsql_test 9.$tn.$i.6 { PRAGMA integrity_check } ok
+  }
 }
 
 finish_test