Fix for tempdb.test so that it passes when running the inmemory_journal permutation...

FossilOrigin-Name: 0256187b512c5849ffae0644e6a42ec0ca2de894

diff --git a/manifest b/manifest
index 64f2f145a6a5c152ae95d279d56292ee440f2e32..00df09656706f4d33d1ceefe5760619a4aa5e9c5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sprocessing\sof\sBEFORE\striggers\son\sINSERT\sstatements\swith\sRHS\sSELECTs\nthat\sinsert\sa\sNULL\sinto\sthe\sINTEGER\sPRIMARY\sKEY.\s\sTicket\s#3832.\s(CVS\s6583)
-D 2009-05-01T02:08:04
+C Fix\sfor\stempdb.test\sso\sthat\sit\spasses\swhen\srunning\sthe\sinmemory_journal\spermutation\stest.\s(CVS\s6584)
+D 2009-05-01T05:23:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -562,7 +562,7 @@ F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
 F test/table.test e47c9323396976389a15fa0cd22ce3a405433186
 F test/tableapi.test 505031f15b18a750184d967d2c896cf88fcc969c
 F test/tclsqlite.test 8b1150d0486c4848c70d96422513a91c5342be0e
-F test/tempdb.test 5f03555be35edc56d2e1a2b31aa9ca81c964ddc4
+F test/tempdb.test 9c869a57e26ef75f9fba19c767097f797bd6ed0c
 F test/temptable.test 5d8ca46be28cc06c887c5a77df650843b7edbae1
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
 F test/tester.tcl b22f925f3c6eea6283e29a81a7379091ca89ab40
@@ -727,7 +727,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 2cd9655e7313671f2bbe8d4a6f13246cbbf61205
-R 8ad70b144833bbdff165cb6ab4489cc8
-U drh
-Z 62d906d73f4d5c255b59654f71b42323
+P 4a1f6a3a9ac8b476c86edac83b555adeef0be4e6
+R 65a593621f683dfa20f7e183c2f4a8a5
+U danielk1977
+Z e7ea26bff8cc48ee908296e3b27e1961

diff --git a/manifest.uuid b/manifest.uuid
index 52a7d63fd60fa5a3034b20e3033109ba1f488591..40802211e82d310fcb4d736ec8a1db502572d28a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a1f6a3a9ac8b476c86edac83b555adeef0be4e6
\ No newline at end of file
+0256187b512c5849ffae0644e6a42ec0ca2de894
\ No newline at end of file

diff --git a/test/tempdb.test b/test/tempdb.test
index 405ba2da4c7e1e3a1f6c7916a79cd9fb9b8a9593..00fd5863856ce6845004adb61eec187d90ba191b 100644 (file)
--- a/test/tempdb.test
+++ b/test/tempdb.test
@@ -12,7 +12,7 @@
 # The focus of this file is in making sure that rolling back
 # a statement journal works correctly.
 #
-# $Id: tempdb.test,v 1.2 2009/04/30 09:10:38 danielk1977 Exp $
+# $Id: tempdb.test,v 1.3 2009/05/01 05:23:18 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -53,7 +53,17 @@ do_test tempdb-1.2 {
 } {}
 
 do_test tempdb-2.1 {
-  set default_in_memory [expr {$TEMP_STORE == 3}]
+  # Set $::jrnl_in_memory if the journal file is expected to be in-memory.
+  # Similarly, set $::subj_in_memory if the sub-journal file is expected
+  # to be in memory. These variables are used to calculate the expected
+  # number of open files in the test cases below.
+  #
+  set jrnl_in_memory [expr {
+    [info exists ::permutations_test_prefix] &&
+    $::permutations_test_prefix eq "inmemory_journal"
+  }]
+  set subj_in_memory [expr {$jrnl_in_memory || $TEMP_STORE == 3}]
+
   db close
   sqlite3 db test.db
 } {}
@@ -68,7 +78,7 @@ do_test tempdb-2.2 {
   }
   catchsql { INSERT INTO t1 SELECT * FROM t2 }
   set sqlite_open_file_count
-} [expr 2 + (0==$default_in_memory)]
+} [expr 1 + (0==$jrnl_in_memory) + (0==$subj_in_memory)]
 do_test tempdb-2.3 {
   execsql {
     PRAGMA temp_store = 'memory';
@@ -80,7 +90,7 @@ do_test tempdb-2.3 {
   }
   catchsql { INSERT INTO t1 SELECT * FROM t2 }
   set sqlite_open_file_count
-} {2}
+} [expr 1 + (0==$jrnl_in_memory)]
 
 finish_test