Ensure the test suite runs with SQLITE_OMIT_PAGER_PRAGMAS defined. (CVS 2145)

FossilOrigin-Name: 2d1f0b923d3c5a669959a03a4344fddcb69c7a98

diff --git a/manifest b/manifest
index 8726dffde895f9024ab65c23423c79db68453572..930b9d77eaea79dc2d0446b3bd5361b010c8fa2f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\stests\spass\swhen\sSQLITE_OMIT_SCHEMA_PRAGMAS\sis\sdefined.\s(CVS\s2144)
-D 2004-11-23T10:13:03
+C Ensure\sthe\stest\ssuite\sruns\swith\sSQLITE_OMIT_PAGER_PRAGMAS\sdefined.\s(CVS\s2145)
+D 2004-11-23T10:52:51
 F Makefile.in 8291610f5839939a5fbff4dbbf85adb0fe1ac37f
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -159,8 +159,8 @@ F test/null.test 5a945790ef21b24fd602fe2c7a23847b903f8687
 F test/pager.test 394455707a079804e8a4e431d12edce831a065f0
 F test/pager2.test 49c0f57c7da0b060f0486b85fdd074025caa694e
 F test/pager3.test 647f696a9cf7409df00a1e0047c2eb55585a1b85
-F test/pagesize.test 6f94b70ed9645dbe6314b627ae765c5dec8036d9
-F test/pragma.test 5b0c3224170832784386e60140d923f099630ee1
+F test/pagesize.test 1b826d1608fd86d2303aa895b5586052ad07eba1
+F test/pragma.test e344e0fdef3683bab053bc6a34b60a4502e80c0b
 F test/printf.test 92ba4c510b4fc61120ffa4a01820446ed917ae57
 F test/progress.test 5ddba78cb6011fba36093973cfb3ac473b8fb96a x
 F test/quick.test 91e5b8ae6663dc9e3e754b271f0384f0cae706e6
@@ -261,7 +261,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 557be3ff5b1c46a3f3836ea3a9d9dede5dc46998
-R 795bf0d67acc367f1399bb179f72bd24
+P 6ccb589bd94fc7d33e07caa39e011c3628563e9b
+R 5a8adf496e1061bb035a6d034efa4c08
 U danielk1977
-Z 6114e34e7feb3954d6ddf0262d880fc7
+Z 568d1ff71d96d7e41d00c01a657aab48

diff --git a/manifest.uuid b/manifest.uuid
index fe9ba34fbd653190162b9c67149aed0101254441..8834a50af03f15c37face03e0e8c61fc3b3f5037 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6ccb589bd94fc7d33e07caa39e011c3628563e9b
\ No newline at end of file
+2d1f0b923d3c5a669959a03a4344fddcb69c7a98
\ No newline at end of file

diff --git a/test/pagesize.test b/test/pagesize.test
index a1567cb4b81d88e351e7fa267c6d221c8a3e94c9..072b07e3bcf457700bec513ae792084930c2cba0 100644 (file)
--- a/test/pagesize.test
+++ b/test/pagesize.test
@@ -11,12 +11,19 @@
 # This file implements regression tests for SQLite library.
 # This file implements tests for the page_size PRAGMA.
 #
-# $Id: pagesize.test,v 1.8 2004/11/10 15:27:38 danielk1977 Exp $
+# $Id: pagesize.test,v 1.9 2004/11/23 10:52:51 danielk1977 Exp $
 
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+# This test script depends entirely on "PRAGMA page_size". So if this
+# pragma is not available, omit the whole file.
+ifcapable !pager_pragmas {
+  finish_test
+  return
+}
+
 do_test pagesize-1.1 {
   execsql {PRAGMA page_size}
 } 1024

diff --git a/test/pragma.test b/test/pragma.test
index fb31f446b6c686900ce3f960df1a94238fd0420a..070f58c18caccac4615e8f878e394c2122003ac8 100644 (file)
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.25 2004/11/23 10:13:03 danielk1977 Exp $
+# $Id: pragma.test,v 1.26 2004/11/23 10:52:51 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -34,6 +34,7 @@ db close
 file delete test.db
 set DB [sqlite3 db test.db]
 
+ifcapable pager_pragmas {
 do_test pragma-1.1 {
   execsql {
     PRAGMA cache_size;
@@ -149,6 +150,7 @@ do_test pragma-1.14 {
     PRAGMA synchronous;
   }
 } {2}
+} ;# ifcapable pager_pragmas
 
 # Test turning "flag" pragmas on and off.
 #
@@ -184,6 +186,7 @@ do_test pragma-2.1 {
     ATTACH 'test2.db' AS aux;
   } 
 } {}
+ifcapable pager_pragmas {
 do_test pragma-2.2 {
   execsql {
     pragma aux.synchronous;
@@ -203,6 +206,7 @@ do_test pragma-2.4 {
     pragma aux.synchronous;
   } 
 } {2 1}
+} ;# ifcapable pager_pragmas
 
 # Construct a corrupted index and make sure the integrity_check
 # pragma finds it.
@@ -240,6 +244,7 @@ do_test pragma-3.3 {
 } {}
 
 # Test modifying the cache_size of an attached database.
+ifcapable pager_pragmas {
 do_test pragma-4.1 {
   execsql {
     pragma aux.cache_size;
@@ -282,9 +287,11 @@ do_test pragma-4.6 {
     pragma aux.default_cache_size;
   } 
 } {456 456}
+} ;# ifcapable pager_pragmas
 
 # Test that modifying the sync-level in the middle of a transaction is
 # disallowed.
+ifcapable pager_pragmas {
 do_test pragma-5.0 {
   execsql {
     pragma synchronous;
@@ -302,6 +309,7 @@ do_test pragma-5.2 {
   } 
 } {2}
 catchsql {COMMIT;}
+} ;# ifcapable pager_pragmas
 
 # Test schema-query pragmas
 #