Fix test script temptable2.test so that it works with the "inmemory_journal" and...

FossilOrigin-Name: b7bec7f2d3d08d0c14f77654be2c5cedf1619e58

diff --git a/manifest b/manifest
index c04f4869ed5d1767f28bfd9a68c81349d0053fdd..1a928a99b5230079fd657e89608536f85977e3ee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges,\sincluding\stest\scase\sfixes,\swith\sthis\sbranch.
-D 2016-04-29T11:35:28.485
+C Fix\stest\sscript\stemptable2.test\sso\sthat\sit\sworks\swith\sthe\s"inmemory_journal"\sand\s"journaltest"\spermutations.
+D 2016-04-29T14:12:48.901
 F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -1113,7 +1113,7 @@ F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
 F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
-F test/temptable2.test d4e967c355b154e8bc387de961430e94c20f2dca
+F test/temptable2.test c3d8c138f493207612960bbd6a8c50e84975e2ee
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
 F test/tester.tcl 30c7a9be8601d1c1c9c93d013545ebcb28d64254
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
@@ -1486,7 +1486,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 6bb5aa2be2a6c5ca66a98a9387b2845507a6bdd2 4cbd50245440e714935399a5c285cf32d8bfc424
-R 7ae3c477f36afa854d04f85029639199
+P 99794aca7b6cb40f08ce4db9889a989fc597eac9
+R f9ef4e1af8653e902d9192ffb04cabc2
 U dan
-Z 1ae9b89d9de363b516966d4d50de5d49
+Z 5d059cb204727917e4a7564cbd5ed599

diff --git a/manifest.uuid b/manifest.uuid
index e7c3b7b953317cf2c33237db6889c69241075339..db83d58f1b390b7d2f88b30c5d84261e4e9785d5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99794aca7b6cb40f08ce4db9889a989fc597eac9
\ No newline at end of file
+b7bec7f2d3d08d0c14f77654be2c5cedf1619e58
\ No newline at end of file

diff --git a/test/temptable2.test b/test/temptable2.test
index 21e06a3a4ffca580bfb36d6d7029ffad40a3841e..890b3b996d7d8caff6abfa97593093a85f39a8f9 100644 (file)
--- a/test/temptable2.test
+++ b/test/temptable2.test
@@ -139,9 +139,11 @@ do_execsql_test 5.1.1 {
   INSERT INTO t1 VALUES(1, 2);
 }
 
+# Test that the temp database is now much bigger than the configured
+# cache size (10 pages).
 do_test 5.1.2 {
   set n [db one { PRAGMA temp.page_count }]
-  expr ($n > 280 && $n < 290)
+  expr ($n > 270 && $n < 290)
 } {1}
 
 do_execsql_test 5.1.3 {
@@ -284,9 +286,9 @@ foreach {tn mode} {
     PRAGMA cache_size = 15;
     PRAGMA auto_vacuum = 1;
   }
-  do_execsql_test 9.$tn.1.2 "PRAGMA journal_mode = $mode" delete
+  execsql "PRAGMA journal_mode = $mode"
 
-  do_execsql_test 9.$tn.1.3 {
+  do_execsql_test 9.$tn.1.2 {
     CREATE TABLE tx(a, b);
     CREATE INDEX i1 ON tx(a);
     CREATE INDEX i2 ON tx(b);
@@ -341,11 +343,14 @@ do_execsql_test 10.1 {
   INSERT INTO t2 VALUES(3, 4);
 }
 
-do_execsql_test 10.2 {
-  PRAGMA mmap_size = 512000;
-  SELECT * FROM t2;
-  PRAGMA integrity_check;
-} {512000 1 2 3 4 ok}
+if {[permutation]!="journaltest"} {
+  # The journaltest permutation does not support mmap, so this part of
+  # the test is omitted.
+  do_execsql_test 10.2 { PRAGMA mmap_size = 512000 } 512000
+}
+
+do_execsql_test 10.3 { SELECT * FROM t2 } {1 2 3 4}
+do_execsql_test 10.4 { PRAGMA integrity_check } ok
 
 finish_test