Adjust savepoint.test so that it can deal with SQLITE_TEMP_STORE=3. (CVS 6163)

FossilOrigin-Name: 3cb910f0ce116af3f291cb913b32abc89493bcc5

diff --git a/manifest b/manifest
index 2c3d2da5452f5f21c012d036c07a3c4c1772579e..f6374513900a6bc7bdb9ea307609bc6afcdab589 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\scrash8.test\sas\spart\sof\sthe\s"journaltest"\spermutation.\scrash8.test\suses\s"PRAGMA\ssynchronous=off",\swhich\sis\sincompatible\swith\sjournaltest.\s(CVS\s6162)
-D 2009-01-10T18:51:40
+C Adjust\ssavepoint.test\sso\sthat\sit\scan\sdeal\swith\sSQLITE_TEMP_STORE=3.\s(CVS\s6163)
+D 2009-01-11T00:18:38
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -496,7 +496,7 @@ F test/rollback.test 1f70ab4301d8d105d41438a436cad1fc8897f5e5
 F test/rowid.test 1c8fc43c60d273e6ea44dfb992db587f3164312c
 F test/rtree.test b85fd4f0861a40ca366ac195e363be2528dcfadf
 F test/safety.test b69e2b2dd5d52a3f78e216967086884bbc1a09c6
-F test/savepoint.test 2ffa8b0526b5b4a857abc9cc57fe4d7d0474ded0
+F test/savepoint.test 19b4027d78e04dd6936498bd85a0a71a39b32e6e
 F test/savepoint2.test 18f6c75d5c133b93838019df8988b8cdf379d3de
 F test/savepoint3.test 5b76f93ffcb5c53bd6ec68e9d57d3b535936c45e
 F test/savepoint4.test fd8850063e3c40565545f5c291e7f79a30591670
@@ -696,7 +696,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8f0672af8d7d46124d01e540eec7b43fc16dd552
-R 464cac85c504261cd53203c3d871603b
-U danielk1977
-Z 8e097e9c18c8a260aec14cdae8ae2058
+P 5f184da6758327e0d5fefe61ac3be06a79cc8269
+R a5cd680cf44d0a93c4a0ad4653aeef29
+U drh
+Z d341f40917425c3ad1d99a7db67cd3c2

diff --git a/manifest.uuid b/manifest.uuid
index 26f9f273294349e921fd27d8fb85f5961bcd12c7..ad409e5934c768239747287b5d3b7cd1f3365da5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f184da6758327e0d5fefe61ac3be06a79cc8269
\ No newline at end of file
+3cb910f0ce116af3f291cb913b32abc89493bcc5
\ No newline at end of file

diff --git a/test/savepoint.test b/test/savepoint.test
index 4d21e81d191e04a6d1116033159f4a20f00a3eda..342da5e549255c874a824673436d291c9db68973 100644 (file)
--- a/test/savepoint.test
+++ b/test/savepoint.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: savepoint.test,v 1.10 2009/01/07 10:35:19 danielk1977 Exp $
+# $Id: savepoint.test,v 1.11 2009/01/11 00:18:38 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -589,6 +589,13 @@ do_test savepoint-10.1.3 {
   }
 } {}
 
+# The lock state of the TEMP database can vary if SQLITE_TEMP_STORE=3
+# And the following set of tests is only really interested in the status
+# of the aux1 and aux2 locks.  So record the current lock status of
+# TEMP for use in the answers.
+set templockstate [lindex [db eval {PRAGMA lock_status}] 3]
+
+
 do_test savepoint-10.2.1 {
   file delete -force test3.db
   file delete -force test2.db
@@ -608,7 +615,7 @@ do_test savepoint-10.2.1 {
 } {t1 t2 t3}
 do_test savepoint-10.2.2 {
   execsql { PRAGMA lock_status }
-} {main unlocked temp unlocked aux1 unlocked aux2 unlocked}
+} [list main unlocked temp $templockstate aux1 unlocked aux2 unlocked]
 
 do_test savepoint-10.2.3 {
   execsql {
@@ -616,20 +623,20 @@ do_test savepoint-10.2.3 {
     INSERT INTO t1 VALUES(1, 2);
     PRAGMA lock_status;
   }
-} {main reserved temp unlocked aux1 unlocked aux2 unlocked}
+} [list main reserved temp $templockstate aux1 unlocked aux2 unlocked]
 do_test savepoint-10.2.4 {
   execsql {
     INSERT INTO t3 VALUES(3, 4);
     PRAGMA lock_status;
   }
-} {main reserved temp unlocked aux1 unlocked aux2 reserved}
+} [list main reserved temp $templockstate aux1 unlocked aux2 reserved]
 do_test savepoint-10.2.5 {
   execsql {
     SAVEPOINT two;
     INSERT INTO t2 VALUES(5, 6);
     PRAGMA lock_status;
   }
-} {main reserved temp unlocked aux1 reserved aux2 reserved}
+} [list main reserved temp $templockstate aux1 reserved aux2 reserved]
 do_test savepoint-10.2.6 {
   execsql { SELECT * FROM t2 }
 } {5 6}
@@ -639,7 +646,7 @@ do_test savepoint-10.2.7 {
 } {}
 do_test savepoint-10.2.8 {
   execsql { PRAGMA lock_status }
-} {main reserved temp unlocked aux1 reserved aux2 reserved}
+} [list main reserved temp $templockstate aux1 reserved aux2 reserved]
 do_test savepoint-10.2.9 {
   execsql { SELECT 'a', * FROM t1 UNION ALL SELECT 'b', * FROM t3 }
 } {a 1 2 b 3 4}
@@ -656,7 +663,7 @@ do_test savepoint-10.2.9 {
 } {1 2 5 6 3 4}
 do_test savepoint-10.2.9 {
   execsql { PRAGMA lock_status }
-} {main unlocked temp unlocked aux1 unlocked aux2 unlocked}
+} [list main unlocked temp $templockstate aux1 unlocked aux2 unlocked]
 
 do_test savepoint-10.2.10 {
   execsql { 
@@ -702,7 +709,7 @@ do_test savepoint-10.2.13 {
 } {1 2 5 6 3 4}
 do_test savepoint-10.2.14 {
   execsql { PRAGMA lock_status }
-} {main unlocked temp unlocked aux1 unlocked aux2 unlocked}
+} [list main unlocked temp $templockstate aux1 unlocked aux2 unlocked]
 
 #-------------------------------------------------------------------------
 # The following tests - savepoint-11.* - test the interaction of 
@@ -808,4 +815,3 @@ do_test savepoint-12.4 {
 } {}
 
 finish_test
-