Fix recently added tests so that they work in all configurations.

FossilOrigin-Name: d0bcaf0cd92ae5bbea7ad68537ba89437d5c39e8

diff --git a/manifest b/manifest
index feb1cf9a6ebe0a0ad215082d13c31fc45245ffc3..412a1d98e5141614255454989c5a06e97ccc43be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3_expanded_sql()\sand\ssqlite3_trace_v2()\sinterfaces.
-D 2016-07-23T05:22:02.142
+C Fix\srecently\sadded\stests\sso\sthat\sthey\swork\sin\sall\sconfigurations.
+D 2016-07-23T14:50:26.969
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -621,7 +621,7 @@ F test/ctime.test 0b995accd44a52914bd4744d5c1b6e1a56c7897c
 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
 F test/cursorhint2.test 2b45341d32d1aae9991a00ef31ebca339b274255
 F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
-F test/dbstatus.test 85833ba5bc95262749d080dcd40af87072ea8d5b
+F test/dbstatus.test 2bb4d576f11c0f57f5633dad373ad1a57c2a7195
 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
 F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
@@ -1324,7 +1324,7 @@ F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d
 F test/vacuum2.test aa048abee196c16c9ba308465494009057b79f9b
 F test/vacuum3.test 77ecdd54592b45a0bcb133339f99f1ae0ae94d0d
 F test/vacuum4.test d3f8ecff345f166911568f397d2432c16d2867d9
-F test/vacuummem.test 09c8b72a12405649ed84564367dad729bff88760
+F test/vacuummem.test ae20cc80a4960d3507d27cf0f2f4555988ceb6df
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test 765802c7a66d37fabd5ac8e2f2dbe572b43eb9ab
@@ -1507,8 +1507,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 f50a3fd6606c14b82c9b938bfca284d54b6c650f 0400f642d542e62bb428e0bf263964c65691368e
-R 4a3af12ad9efd4d7dc81ee4ca45f95f6
-T +closed 0400f642d542e62bb428e0bf263964c65691368e
+P 99a6c51887d9d78409944c5a028d5a3ac2e066a7
+R dcbad5b66668d4f45eebea8d8e4c4fc1
 U drh
-Z 2820f9890a85b78d1796850ebe9bb3ba
+Z b2cb07cac2703599b169fabec6f383c3

diff --git a/manifest.uuid b/manifest.uuid
index 288e6dc899d52cd123cb2361d1e2f15fb540c2d5..77b620836ba488cac0cdb5c99ac38162dc3e7dda 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99a6c51887d9d78409944c5a028d5a3ac2e066a7
\ No newline at end of file
+d0bcaf0cd92ae5bbea7ad68537ba89437d5c39e8
\ No newline at end of file

diff --git a/test/dbstatus.test b/test/dbstatus.test
index 00c5deabd51b41a861457484b79b0fa4347a5f67..fb4cbe04ba464d32f80fc222090b58ea5d9c8317 100644 (file)
--- a/test/dbstatus.test
+++ b/test/dbstatus.test
@@ -390,6 +390,7 @@ ifcapable shared_cache {
   sqlite3 db file:test.db?cache=shared
 
   do_execsql_test 4.0 {
+    PRAGMA auto_vacuum=NONE;
     CREATE TABLE t1(a, b, c);
     INSERT INTO t1 VALUES(1, 2, 3);
   }

diff --git a/test/vacuummem.test b/test/vacuummem.test
index 967e28cec7404470cf0e6ab84d354500fcbeaf0a..b0f5cf203865d49157216e3b5fc76bb96af77b28 100644 (file)
--- a/test/vacuummem.test
+++ b/test/vacuummem.test
@@ -17,6 +17,12 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix vacuummem
 
+if {[permutation]=="memsubsys1"} {
+  finish_test
+  return
+}
+
+
 proc memory_used {} { 
   set stat [sqlite3_status SQLITE_STATUS_MEMORY_USED 1]  
   lindex $stat 1
@@ -51,4 +57,3 @@ do_test 1.5 { memory_used } {#/2300000/}
 
 
 finish_test
-