Fix a couple of test script problems on this branch. Both related to the fact that...

FossilOrigin-Name: 6bb5aa2be2a6c5ca66a98a9387b2845507a6bdd2

diff --git a/manifest b/manifest
index 52a995d5ff0d4a572d9b011fa5efaecc94fe5ed5..45d249293336e0822078ecc084c73776fbd828fa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sissue\sin\stemptable2.test\spreventing\sit\sfrom\sworking\swith\sSQLITE_DEFAULT_AUTOVACUUM=1\sbuilds.
-D 2016-04-26T17:10:03.745
+C Fix\sa\scouple\sof\stest\sscript\sproblems\son\sthis\sbranch.\sBoth\srelated\sto\sthe\sfact\sthat\stemp\sdatabase\spage\ssizes\scan\sno\slonger\sbe\schanged\sby\sVACUUM\sor\sthe\sbackup\sAPI\safter\sthe\stemp\sdb\sis\spopulated.
+D 2016-04-27T11:24:42.387
 F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -512,7 +512,7 @@ F test/autovacuum.test 92c24eedbdb68e49f3fb71f26f9ce6d8988cac15
 F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4
 F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
 F test/backcompat.test 3e64cedda754c778ef6bbe417b6e7a295e662a4d
-F test/backup.test b79299a536a4c6d919094786595b95be56d02014
+F test/backup.test dd4a5ff756e3df3931dacb1791db0584d4bad989
 F test/backup2.test 34986ef926ea522911a51dfdb2f8e99b7b75ebcf
 F test/backup4.test 8f6fd48e0dfde77b9a3bb26dc471ede3e101df32
 F test/backup5.test ee5da6d7fe5082f5b9b0bbfa31d016f52412a2e4
@@ -968,7 +968,7 @@ F test/pager1.test 841868017e9dd3cb459b8d78862091a7d9cff21d
 F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
-F test/pagerfault.test ae9ee0db5a30aecda9db8290ce3dd12e5f7bbaa1
+F test/pagerfault.test 42ff797b1e6426c141cc7ee8b7417c9f27427950
 F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
 F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
 F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
@@ -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 04911cee0cd5467ee99744b774d692219e5e1425
-R 849d538a2e2ee898d96d5ba70eff854f
+P e790aac02e4b427b4891b514a050699d159b03b1
+R 167ee4a4f32b4f8204918ef34f7c21ee
 U dan
-Z 496f6fcde8513321efb142fd9a4f11c8
+Z bbfd58a46d92c2867a1001ebb15e237d

diff --git a/manifest.uuid b/manifest.uuid
index 021372e495ec74bf2a67b337e3ab8f5cf7b06845..eadf0ef5a0b5502a3efddbb9fa2c9f0bf85bfeec 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e790aac02e4b427b4891b514a050699d159b03b1
\ No newline at end of file
+6bb5aa2be2a6c5ca66a98a9387b2845507a6bdd2
\ No newline at end of file

diff --git a/test/backup.test b/test/backup.test
index 3b1e1db9e588a44289ee7653ecd01ebad4745bd6..829b32452da01839d00f3f7a176d0efe3d2cdd44 100644 (file)
--- a/test/backup.test
+++ b/test/backup.test
@@ -164,7 +164,7 @@ foreach zOpenScript [list {
   set file_dest temp
 }] {
 foreach rows_dest {0 3 10} {
-foreach pgsz_dest {512 1024 2048} {
+foreach pgsz_dest {512 1024 2048 4096} {
 foreach nPagePerStep {1 200} {
 
   # Open the databases.
@@ -176,17 +176,16 @@ foreach nPagePerStep {1 200} {
   # in-memory destination is only possible if the initial destination
   # page size is the same as the source page size (in this case 1024 bytes).
   #
-  set isMemDest [expr {
-    $zDestFile eq ":memory:" || $file_dest eq "temp" && $TEMP_STORE>=2
-  }]
-
-  if { $isMemDest==0 || $pgsz_dest == 1024 } {
-    if 0 {
-      puts -nonewline "Test $iTest: src=$zSrcFile dest=$zDestFile"
-      puts -nonewline " (as $db_dest.$file_dest)"
-      puts -nonewline " rows_dest=$rows_dest pgsz_dest=$pgsz_dest"
-      puts ""
-    }
+  set isMemDest [expr { $zDestFile eq ":memory:" || $file_dest eq "temp" }]
+
+  if 0 {
+    puts -nonewline "Test $iTest: src=$zSrcFile dest=$zDestFile"
+    puts -nonewline " (as $db_dest.$file_dest)"
+    puts -nonewline " rows_dest=$rows_dest pgsz_dest=$pgsz_dest"
+    puts ""
+  }
+
+  if { $isMemDest==0 || $pgsz_dest==1024 || $rows_dest==0 } {
 
     # Set up the content of the source database.
     execsql {

diff --git a/test/pagerfault.test b/test/pagerfault.test
index c0f5de69acc0a6a0bed37bc8157e5fb4c9214e4f..2e70171b20b22dddffe6d8b0c38f703bba277660 100644 (file)
--- a/test/pagerfault.test
+++ b/test/pagerfault.test
@@ -684,22 +684,24 @@ do_faultsim_test pagerfault-14a -prep {
 # is not possible to change the page-size of an in-memory database. Even
 # using the backup API.
 #
-if {$TEMP_STORE<2} {
-  do_faultsim_test pagerfault-14b -prep {
-    catch { db2 close }
-    faultsim_restore_and_reopen
+# Update: It is no longer possible to change the page size of any temp
+# database after it has been created.
+#
+do_faultsim_test pagerfault-14b -prep {
+  catch { db2 close }
+  faultsim_restore_and_reopen
     sqlite3 db2 ""
     db2 eval { PRAGMA page_size = 4096; CREATE TABLE xx(a) }
-  } -body {
-    sqlite3_backup B db2 main db main
-    B step 200
-    set rc [B finish]
-    if {[string match SQLITE_IOERR_* $rc]} {set rc SQLITE_IOERR}
-    if {$rc != "SQLITE_OK"} { error [sqlite3_test_errstr $rc] }
-    set {} {}
-  } -test {
-    faultsim_test_result {0 {}} {1 {sqlite3_backup_init() failed}}
-  }
+} -body {
+  sqlite3_backup B db2 main db main
+  B step 200
+  set rc [B finish]
+  if {[string match SQLITE_IOERR_* $rc]} {set rc SQLITE_IOERR}
+  if {$rc != "SQLITE_OK"} { error [sqlite3_test_errstr $rc] }
+  set {} {}
+} -test {
+  faultsim_test_result {1 {attempt to write a readonly database}} \
+                       {1 {sqlite3_backup_init() failed}}
 }
 
 do_faultsim_test pagerfault-14c -prep {