From: dan <dan@noemail.net>
Date: Mon, 13 Sep 2010 19:03:38 +0000 (+0000)
Subject: Fix walmode.test so that all tests pass with SQLITE_TEMP_STORE=3.
X-Git-Tag: experimental~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4565682f75ed1fe51d852189908dc75b3f178902;p=thirdparty%2Fsqlite.git

Fix walmode.test so that all tests pass with SQLITE_TEMP_STORE=3.

FossilOrigin-Name: 6ba6e59a9d528fb1bdc530d48ab96a2de6e190d6
---

diff --git a/manifest b/manifest
index 5040be621f..aab5c8ef29 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\scompound\sSELECT\sstatements\sto\se_select.test.
-D 2010-09-13T18:58:33
+C Fix\swalmode.test\sso\sthat\sall\stests\spass\swith\sSQLITE_TEMP_STORE=3.
+D 2010-09-13T19:03:38
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -807,7 +807,7 @@ F test/walcrash.test e763841551d6b23677ccb419797c1589dcbdbaf5
 F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 F test/walfault.test 05c470688d742688e455dd56816bd6bcffa298f8
 F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
-F test/walmode.test 4ecd37284f245247f7935896ab66f6943f0432a0
+F test/walmode.test 22ddccd073c817ac9ead62b88ac446e8dedc7d2c
 F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
@@ -857,7 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8cb39306f4bd9104c9d15d5ee98ec1252e798997
-R ea7890a7325b1ef483fb569c05bb662a
+P 8b0b009f292e0b52bffb08662aef67d9465e5a0a
+R 543bdeb104c741398b4c52508ded2b55
 U dan
-Z 4d374c026bd8b69bfc76d182067e92a2
+Z 3a31e4f571c8c095188e7b06c7f17753
diff --git a/manifest.uuid b/manifest.uuid
index d0960dd95a..45e01d1bdb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b0b009f292e0b52bffb08662aef67d9465e5a0a
\ No newline at end of file
+6ba6e59a9d528fb1bdc530d48ab96a2de6e190d6
\ No newline at end of file
diff --git a/test/walmode.test b/test/walmode.test
index 2506c90e1e..11113c6be3 100644
--- a/test/walmode.test
+++ b/test/walmode.test
@@ -207,13 +207,18 @@ do_test walmode-5.1.5 {
   }
 } {1 2 3 4 memory}
 
+if {$TEMP_STORE>=2} {
+  set tempJrnlMode memory
+} else {
+  set tempJrnlMode delete
+}
 do_test walmode-5.2.1 {
   sqlite3 db ""
   execsql { PRAGMA main.journal_mode }
-} {delete}
+} $tempJrnlMode
 do_test walmode-5.2.2 {
   execsql { PRAGMA main.journal_mode = wal }
-} {delete}
+} $tempJrnlMode
 do_test walmode-5.2.3 {
   execsql {
     BEGIN;
@@ -223,23 +228,18 @@ do_test walmode-5.2.3 {
     SELECT * FROM t1;
     PRAGMA main.journal_mode;
   }
-} {1 2 delete}
+} [list 1 2 $tempJrnlMode]
 do_test walmode-5.2.4 {
   execsql { PRAGMA main.journal_mode = wal }
-} {delete}
+} $tempJrnlMode
 do_test walmode-5.2.5 {
   execsql { 
     INSERT INTO t1 VALUES(3, 4);
     SELECT * FROM t1;
     PRAGMA main.journal_mode;
   }
-} {1 2 3 4 delete}
+} [list 1 2 3 4 $tempJrnlMode]
 
-if {$TEMP_STORE>=2} {
-  set tempJrnlMode memory
-} else {
-  set tempJrnlMode delete
-}
 do_test walmode-5.3.1 {
   sqlite3 db test.db
   execsql { PRAGMA temp.journal_mode }