Test case modifications to support SEE.

mackyle · Oct 12, 2018 · 841904a · 841904a
1 parent 17909ed
commit 841904a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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