From: drh <drh@noemail.net>
Date: Fri, 12 Oct 2018 15:01:56 +0000 (+0000)
Subject: Test case modifications to support SEE.
X-Git-Tag: version-3.26.0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bafad06139a14a7deefc836af52e22605abc6f25;p=thirdparty%2Fsqlite.git

Test case modifications to support SEE.

FossilOrigin-Name: 02b6f8f2778c371130c512e980c3db07c7e76dcf7dd92a878b86e4b6a47ca307
---

diff --git a/manifest b/manifest
index ac92d94aaf..2ee3c8fa1d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\stextkey\sand\stextrekey\spragmas.
-D 2018-10-11T18:41:50.384
+C Test\scase\smodifications\sto\ssupport\sSEE.
+D 2018-10-12T15:01:56.030
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -770,7 +770,7 @@ F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
 F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b10
 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
 F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c
-F test/dbstatus.test c15fa97f743dac7ce996814c84b56317e138895ee15ce27f15b608aa6924c90a
+F test/dbstatus.test cd83aa623b8aab477269bc94cf8aa90c1e195a144561dd04a1620770aaa8524e
 F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
 F test/delete.test 31832b0c45ecb51a54348c68db173be462985901e6ed7f403d6d7a8f70ab4ef0
@@ -1175,7 +1175,7 @@ F test/permutations.test 8749e292c8f7e98072049543da8c0fe60e1625f0a9f490686230609
 F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
 F test/pragma.test 7c8cfc328a1717a95663cf8edb06c52ddfeaf97bb0aee69ae7457132e8d39e7d
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
-F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
+F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
 F test/pragma4.test 3046501bee2f652dc2a4f9c87781e2741361d6864439c8381aba6c3b774b335c
 F test/pragma5.test 824ce6ced5d6b7ec71abe37fc6005ff836fe39d638273dc5192b39864b9ee983
 F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
@@ -1255,7 +1255,7 @@ F test/server1.test c2b00864514a68a0e6fd518659dc95d0050307a357a08969872bef027d78
 F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
 F test/sessionfuzz-data1.db 1f8d5def831f19b1c74571037f0d53a588ea49a6c4ca2a028fc0c27ef896dbcb
 F test/sessionfuzz.c b0fcdcf757451957e17396a3af5171f1fdf9b2babc81da9fa35675df46c4729a
-F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
+F test/shared.test 1826673eb5eb745fb91a3bdac99a7737057742ae38dcb0fe076a384d6727578b
 F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
 F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
 F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
@@ -1771,8 +1771,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 1916d2912a4ef5c251853de3c9d66417e20f0c0fc8ddfbc84c131dfd798439f6
-Q +f829099d2558011d2f19ed3e91778b97e4ce0bdaa4a7cd6b0009f705554398ca
-R 63af1cda40897d849945c1a22dbd668a
+P f03164d45450cd7ff2162999aa9e51eec7fb5e7cab1fa83d876b544f8f841097
+R b06a0e84dfe3f0b011ce56cc2f8b5cd1
 U drh
-Z 865f15d326c847ade3537f91a0382191
+Z f26fa73bb00e67aa8b5d34053794de3a
diff --git a/manifest.uuid b/manifest.uuid
index 54e36d8a4f..2ce3280c9c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f03164d45450cd7ff2162999aa9e51eec7fb5e7cab1fa83d876b544f8f841097
\ No newline at end of file
+02b6f8f2778c371130c512e980c3db07c7e76dcf7dd92a878b86e4b6a47ca307
\ No newline at end of file
diff --git a/test/dbstatus.test b/test/dbstatus.test
index 57b91cda1a..564b9c5966 100644
--- a/test/dbstatus.test
+++ b/test/dbstatus.test
@@ -379,9 +379,9 @@ foreach ::lookaside_buffer_size {0 64 120} {
 # The following tests focus on DBSTATUS_CACHE_USED_SHARED
 #
 ifcapable shared_cache {
-  if {[permutation]=="memsys3"
+  if {([permutation]=="memsys3"
       || [permutation]=="memsys5"
-      || $::tcl_platform(os)=="Linux"} {
+      || $::tcl_platform(os)=="Linux") && ![sqlite3 -has-codec]} {
     proc do_cacheused_test {tn db res} {
       set cu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED 0]
       set pcu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED_SHARED 0]
diff --git a/test/pragma3.test b/test/pragma3.test
index 8a4f4f9d84..eebbcbb9c6 100644
--- a/test/pragma3.test
+++ b/test/pragma3.test
@@ -15,7 +15,11 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-do_not_use_codec
+
+if {[sqlite3 -has-codec]} {
+  finish_test
+  return
+}
 
 do_execsql_test pragma3-100 {
   PRAGMA data_version;
diff --git a/test/shared.test b/test/shared.test
index 4eab476582..589df4d631 100644
--- a/test/shared.test
+++ b/test/shared.test
@@ -1145,38 +1145,40 @@ do_test shared-$av-16.8 {
 
 # Shared cache on named memory databases attached to readonly connections.
 #
-do_test shared-$av-16.8.1 {
+if {![sqlite3 -has-codec]} {
+  do_test shared-$av-16.8.1 {
+    db1 close
+    db2 close
+  
+    sqlite3 db test1.db
+    db eval { 
+      CREATE TABLE yy(a, b);
+      INSERT INTO yy VALUES(77, 88);
+    }
+    db close
+  
+    sqlite3 db1 test1.db -uri 1 -readonly 1
+    sqlite3 db2 test2.db -uri 1 
+  
+    db1 eval { 
+      ATTACH 'file:mem?mode=memory&cache=shared' AS shared; 
+      CREATE TABLE shared.xx(a, b);
+      INSERT INTO xx VALUES(55, 66);
+    }
+    db2 eval { 
+      ATTACH 'file:mem?mode=memory&cache=shared' AS shared;
+      SELECT * FROM xx;
+    }
+  } {55 66}
+  
+  do_test shared-$av-16.8.2 { db1 eval { SELECT * FROM yy } } {77 88}
+  do_test shared-$av-16.8.3 { 
+    list [catch {db1 eval { INSERT INTO yy VALUES(1, 2) }} msg] $msg
+  } {1 {attempt to write a readonly database}}
+  
   db1 close
   db2 close
-
-  sqlite3 db test1.db
-  db eval { 
-    CREATE TABLE yy(a, b);
-    INSERT INTO yy VALUES(77, 88);
-  }
-  db close
-
-  sqlite3 db1 test1.db -uri 1 -readonly 1
-  sqlite3 db2 test2.db -uri 1 
-
-  db1 eval { 
-    ATTACH 'file:mem?mode=memory&cache=shared' AS shared; 
-    CREATE TABLE shared.xx(a, b);
-    INSERT INTO xx VALUES(55, 66);
-  }
-  db2 eval { 
-    ATTACH 'file:mem?mode=memory&cache=shared' AS shared;
-    SELECT * FROM xx;
-  }
-} {55 66}
-
-do_test shared-$av-16.8.2 { db1 eval { SELECT * FROM yy } } {77 88}
-do_test shared-$av-16.8.3 { 
-  list [catch {db1 eval { INSERT INTO yy VALUES(1, 2) }} msg] $msg
-} {1 {attempt to write a readonly database}}
-
-db1 close
-db2 close
+}
 
 }  ;# end of autovacuum on/off loop