Fix a couple of test scripts so that they work with

-DSQLITE_DISABLE_FTS4_DEFERRED builds.

FossilOrigin-Name: 30018d31068f3182d713a6cf09753b27b16a6f912d39a5e6c1363da83bec3125

diff --git a/manifest b/manifest
index a29ea679b08a5ea2a239cccd9991fb370a1df7f3..086883cb26617e1039ed0f62212771076afba5a2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sunnecessary\scodec\soperations\son\sin-memory\ssubjournals.
-D 2017-05-10T12:58:34.110
+C Fix\sa\scouple\sof\stest\sscripts\sso\sthat\sthey\swork\swith\n-DSQLITE_DISABLE_FTS4_DEFERRED\sbuilds.
+D 2017-05-10T13:36:04.868
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@@ -791,13 +791,13 @@ F test/fts3expr2.test 18da930352e5693eaa163a3eacf96233b7290d1a
 F test/fts3expr3.test c4d4a7d6327418428c96e0a3a1137c251b8dfbf8
 F test/fts3expr4.test c39a15d676b14fc439d9bf845aa7bddcf4a74dc3
 F test/fts3expr5.test f9abfffbf5e53d48a33e12a1e8f8ba2c551c9b49
-F test/fts3fault.test 268e9589f44f49d6694ef39a293f0e0f80c6230fb01cc6f34325412acceb99ae
+F test/fts3fault.test 3764ecffb3d341c5b05b3abe64153f385880035e67706ca2fc719e5d3352aedb
 F test/fts3fault2.test 536bbe01fe2946ec24b063a5eee813e8fd90354a6ca0b8f941d299c405edd17e
 F test/fts3first.test dbdedd20914c8d539aa3206c9b34a23775644641
 F test/fts3join.test 34750f3ce1e29b2749eaf0f1be2fa6301c5d50da
 F test/fts3malloc.test b0e4c133b8d61d4f6d112d8110f8320e9e453ef6
 F test/fts3matchinfo.test ce864e0bd92429df8008f31cf557269ba172482a
-F test/fts3misc.test f481128013b9555babdf3bc04c58ab59d59bebc24b5f780f50342b9ffe05b547
+F test/fts3misc.test 66e7b59576ce2c795f0baff6d47f7f6f57e6f41101cf85fad05989e43bb060dd
 F test/fts3near.test 7e3354d46f155a822b59c0e957fd2a70c1d7e905
 F test/fts3offsets.test b85fd382abdc78ebce721d8117bd552dfb75094c
 F test/fts3prefix.test fa794eaab0bdae466494947b0b153d7844478ab2
@@ -1579,8 +1579,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 04e7e5650efffdce759b46999beb67c250af6cf394a7779ab861f210a84c134d d2bb0066f7c8413ef9992e6b07641cdf40ad260778074bd83cc22dcaba87860b
-R 036cd868b45040b2c72bb4968e138d5b
-T +closed d2bb0066f7c8413ef9992e6b07641cdf40ad260778074bd83cc22dcaba87860b
-U drh
-Z 4b970db82062c1fa9f8c0e5f1157ed72
+P 199b2a84992823b4687588a5ba20bec9c42579887068ac21caf08df3895f41ed
+R aac74a43ca2ae14e0065de21361f39b3
+U dan
+Z ef67ced9f009068f9285813993732c7e

diff --git a/manifest.uuid b/manifest.uuid
index 4c0989b52cad28f2684a8eec722b9fcd8acd1373..b143d46fb28814a2a1d8cb366ce19668b230e993 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-199b2a84992823b4687588a5ba20bec9c42579887068ac21caf08df3895f41ed
\ No newline at end of file
+30018d31068f3182d713a6cf09753b27b16a6f912d39a5e6c1363da83bec3125
\ No newline at end of file

diff --git a/test/fts3fault.test b/test/fts3fault.test
index 2622e471364cb87df3f0a1d1487e6eec4bea6c4e..56835f4e0e908803fbab0c351e192c91e90bc498 100644 (file)
--- a/test/fts3fault.test
+++ b/test/fts3fault.test
@@ -177,13 +177,15 @@ do_test 8.0 {
   faultsim_save_and_close
 } {}
 
-do_faultsim_test 8.1 -faults oom-t* -prep { 
-  faultsim_restore_and_reopen
-  db func mit mit
-} -body {
-  execsql { SELECT mit(matchinfo(t8, 'x')) FROM t8 WHERE t8 MATCH 'a b c' }
-} -test {
-  faultsim_test_result {0 {{1 1 1 1 4 2 1 5 5}}}
+ifcapable fts4_deferred {
+  do_faultsim_test 8.1 -faults oom-t* -prep { 
+    faultsim_restore_and_reopen
+    db func mit mit
+  } -body {
+    execsql { SELECT mit(matchinfo(t8, 'x')) FROM t8 WHERE t8 MATCH 'a b c' }
+  } -test {
+    faultsim_test_result {0 {{1 1 1 1 4 2 1 5 5}}}
+  }
 }
 
 do_faultsim_test 8.2 -faults oom-t* -prep { 

diff --git a/test/fts3misc.test b/test/fts3misc.test
index 0d003bd32423450b6c50a83991a19e32bf7df8dc..1fe0f500f789f14387f3689e6df79bc666d5b86d 100644 (file)
--- a/test/fts3misc.test
+++ b/test/fts3misc.test
@@ -147,30 +147,32 @@ do_execsql_test 3.1.5 {
 #-------------------------------------------------------------------------
 #
 reset_db
-do_execsql_test 4.0 {
-  PRAGMA page_size = 512;
-  CREATE VIRTUAL TABLE t4 USING fts4;
-  WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<8000 )
-  INSERT INTO t4 SELECT 'a b c a b c a b c' FROM s;
-}
-do_execsql_test 4.1 {
-  SELECT count(*) FROM t4 WHERE t4 MATCH '"a b c" OR "c a b"'
-} {8000}
-do_execsql_test 4.2 {
-  SELECT quote(value) from t4_stat where id=0
-} {X'C03EC0B204C0A608'}
-do_execsql_test 4.3 {
-  UPDATE t4_stat SET value = X'C03EC0B204C0A60800' WHERE id=0;
-}
-do_catchsql_test 4.4 {
-  SELECT count(*) FROM t4 WHERE t4 MATCH '"a b c" OR "c a b"'
-} {1 {database disk image is malformed}}
-do_execsql_test 4.5 {
-  UPDATE t4_stat SET value = X'00C03EC0B204C0A608' WHERE id=0;
-}
-do_catchsql_test 4.6 {
-  SELECT count(*) FROM t4 WHERE t4 MATCH '"a b c" OR "c a b"'
-} {1 {database disk image is malformed}}
+ifcapable fts4_deferred {
+  do_execsql_test 4.0 {
+    PRAGMA page_size = 512;
+    CREATE VIRTUAL TABLE t4 USING fts4;
+    WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<8000 )
+    INSERT INTO t4 SELECT 'a b c a b c a b c' FROM s;
+  }
+  do_execsql_test 4.1 {
+    SELECT count(*) FROM t4 WHERE t4 MATCH '"a b c" OR "c a b"'
+  } {8000}
+  do_execsql_test 4.2 {
+    SELECT quote(value) from t4_stat where id=0
+  } {X'C03EC0B204C0A608'}
+  do_execsql_test 4.3 {
+    UPDATE t4_stat SET value = X'C03EC0B204C0A60800' WHERE id=0;
+  }
+  do_catchsql_test 4.4 {
+    SELECT count(*) FROM t4 WHERE t4 MATCH '"a b c" OR "c a b"'
+  } {1 {database disk image is malformed}}
+  do_execsql_test 4.5 {
+    UPDATE t4_stat SET value = X'00C03EC0B204C0A608' WHERE id=0;
+  }
+  do_catchsql_test 4.6 {
+    SELECT count(*) FROM t4 WHERE t4 MATCH '"a b c" OR "c a b"'
+  } {1 {database disk image is malformed}}
+}
 
 #-------------------------------------------------------------------------
 #