Updates for Windows.

FossilOrigin-Name: cc9d9a12c3b19320b0ecfa78a6cee3d668004988

diff --git a/manifest b/manifest
index 62a4db2d42bb9ff9f66db1096b2e4c874dbc94f7..35d555865b580391ce455050d33f66d850ad5bb2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Include\sthe\sprint_pager_state()\sfunction\sonly\sif\sSQLITE_DEBUG\sis\sdefined.
-D 2010-11-04T04:47:43
+C Updates\sfor\sWindows.
+D 2010-11-04T20:46:09
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2c8cefd962eca0147132c7cf9eaa4bb24c656f3f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -258,7 +258,7 @@ F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
 F test/attach.test ce9660e51768fab93cf129787be886c5d6c4fd81
 F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
 F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
-F test/attachmalloc.test 38d2da5fdaf09ba0add57296967a3061e5842584
+F test/attachmalloc.test 1d5b821a676f7bf0b00d87cc106b78966789ba57
 F test/auth.test 26cc6f219580191539bf335abe03e55e49310846
 F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
 F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5
@@ -576,7 +576,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test 193238b7828759805091ecddd9a0912767f236a4
+F test/permutations.test 28d7e1fb31486477d7747508f58fd79f0b6e3a33
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -883,7 +883,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 31989b18f53d97eddfb39660ef04fbf9463583e0
-R 77870c9f645f63161c757949a10d4b5d
-U dan
-Z 5b77deb3710cb464f4b30c8cda028e60
+P 3104f17e5dd0be4f176905dde6df3be50ba28702
+R 204c56acbc1eb9022da7f25a997c6f09
+U shaneh
+Z ed2bea2e97360a4a06430cbd8896f083

diff --git a/manifest.uuid b/manifest.uuid
index b78b77bbc61fee7d3aaf262560f89a18d55d2b10..8af9191941b3be322f19c409ad8a25075ba96358 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3104f17e5dd0be4f176905dde6df3be50ba28702
\ No newline at end of file
+cc9d9a12c3b19320b0ecfa78a6cee3d668004988
\ No newline at end of file

diff --git a/test/attachmalloc.test b/test/attachmalloc.test
index cc506bee6abbaaa24efb094cb2e4fe1b68daeac8..c485c618bd4c5917bb310a93afbfa12788cf3d0c 100644 (file)
--- a/test/attachmalloc.test
+++ b/test/attachmalloc.test
@@ -26,8 +26,9 @@ ifcapable !memdebug||!attach {
 source $testdir/malloc_common.tcl
 
 do_malloc_test attachmalloc-1 -tclprep {
-  db close
+  catch { db close }
   for {set i 2} {$i<=4} {incr i} {
+    catch { db$i close }
     file delete -force test$i.db
     file delete -force test$i.db-journal
   }
@@ -61,13 +62,13 @@ do_malloc_test attachmalloc-2 -tclprep {
 }
 
 set enable_shared_cache [sqlite3_enable_shared_cache 1]
-sqlite3 dbaux test2.db
+sqlite3 dbaux test3.db
 dbaux eval {SELECT * FROM sqlite_master}
 do_malloc_test attachmalloc-3 -sqlbody {
   SELECT * FROM sqlite_master;
-  ATTACH 'test2.db' AS two;
+  ATTACH 'test3.db' AS three;
 } -cleanup {
-  db eval { DETACH two }
+  db eval { DETACH three }
 }
 dbaux close
 sqlite3_enable_shared_cache $enable_shared_cache

diff --git a/test/permutations.test b/test/permutations.test
index 5576f5bf392a4a32b47d8c109e497b63260686a1..daa8607dfad71137972fa96fa5e35ddac19ea968 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -771,9 +771,15 @@ proc run_tests {name args} {
 
   uplevel $options(-initialize)
 
+  # uncomment stuff here to skip to a particular test
+  set skip_to_file "pagerfault.test"
+  set skip 1
   foreach file [lsort $options(-files)] {
-    if {[file tail $file] == $file} { set file [file join $::testdir $file] }
-    slave_test_file $file
+    if {[file tail $file] == $skip_to_file} { set skip 0 }
+    if {$skip == 0} {
+      if {[file tail $file] == $file} { set file [file join $::testdir $file] }
+      slave_test_file $file
+    }
   }
 
   uplevel $options(-shutdown)