Fix an incompatibility with OMIT_VIRTUALTABLE in e_vacuum.test.

FossilOrigin-Name: 7d0b881a6294b7f13069b2e4b69c0c0d46606505

diff --git a/manifest b/manifest
index 45598e705f27b342c0a6f0a9f0362b0936d70a59..820784bdeaf9fc3667de2c7ac6e4f3a19926bce3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Updates\sto\sthe\ssqlite3_get_table()\sdocumentation.
-D 2010-09-28T13:12:51
+C Fix\san\sincompatibility\swith\sOMIT_VIRTUALTABLE\sin\se_vacuum.test.
+D 2010-09-28T14:11:26
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -361,7 +358,7 @@ F test/e_reindex.test a064f0878b8f848fbca38f1f61f82f15a3000c64
 F test/e_select.test 6c0244eacf43bf8406d7ae3363d77265b0d4ff8f
 F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92
 F test/e_update.test 963d6876064e65f318d1c93aaed36a02b9b389bf
-F test/e_vacuum.test f56e8af24412fcf7e9412567947349b9646ecb5e
+F test/e_vacuum.test 6465a1cd3285dd0eaa29ac26b7b6830f826963ef
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
@@ -871,14 +868,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 88108fff672b6012ffe87ba4b1efe6d5a07037d1
-R 62eb83ce7402078eda4d46a3720d1bc0
-U drh
-Z e1fc9f70b217665fc93baf8f4f7536cd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMoenWoxKgR168RlERAp4pAJ0T37hXwFJQ2aW/fE3pt0QiFBp7lwCcCaGF
-XLDtZ232M8EgPmyFmr14UCk=
-=+VhH
------END PGP SIGNATURE-----
+P c7aa238c3797d8f735739a182d18aeada089def2
+R 02eb407b68bbdc77abebe657b1ab5ab8
+U dan
+Z bc99efb1b30b132cd30ec416645e67f8

diff --git a/manifest.uuid b/manifest.uuid
index a1b9217a671b9877a86f42a1d724ca08d31548c8..cf5cd7a20313019cfdca19935f5aa3b4d5bdd335 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7aa238c3797d8f735739a182d18aeada089def2
\ No newline at end of file
+7d0b881a6294b7f13069b2e4b69c0c0d46606505
\ No newline at end of file

diff --git a/test/e_vacuum.test b/test/e_vacuum.test
index b525c0e9632d5cc24ee417560979a7c916695314..d44885bf682b8186556af57479957f978a1ed097 100644 (file)
--- a/test/e_vacuum.test
+++ b/test/e_vacuum.test
@@ -122,26 +122,28 @@ foreach {tn avmode sz} {
 #   e_vacuum-1.2.4 - Verify that t1 and its indexes are now much 
 #                    less fragmented.
 #
-create_db 
-register_dbstat_vtab db
-do_execsql_test e_vacuum-1.2.1 {
-  DELETE FROM t1 WHERE a%2;
-  INSERT INTO t1 SELECT b, a FROM t2 WHERE a%2;
-  UPDATE t1 SET b=randomblob(600) WHERE (a%2)==0;
-} {}
-
-do_test e_vacuum-1.2.2.1 { expr [fragment_count t1]>100 } 1
-do_test e_vacuum-1.2.2.2 { expr [fragment_count sqlite_autoindex_t1_1]>100 } 1
-do_test e_vacuum-1.2.2.3 { expr [fragment_count sqlite_autoindex_t1_2]>100 } 1
-
-do_execsql_test e_vacuum-1.2.3 { VACUUM } {}
-
-# In practice, the tables and indexes each end up stored as two fragments -
-# one containing the root page and another containing all other pages.
-#
-do_test e_vacuum-1.2.4.1 { fragment_count t1 }                    2
-do_test e_vacuum-1.2.4.2 { fragment_count sqlite_autoindex_t1_1 } 2
-do_test e_vacuum-1.2.4.3 { fragment_count sqlite_autoindex_t1_2 } 2
+ifcapable vtab {
+  create_db 
+  register_dbstat_vtab db
+  do_execsql_test e_vacuum-1.2.1 {
+    DELETE FROM t1 WHERE a%2;
+    INSERT INTO t1 SELECT b, a FROM t2 WHERE a%2;
+    UPDATE t1 SET b=randomblob(600) WHERE (a%2)==0;
+  } {}
+  
+  do_test e_vacuum-1.2.2.1 { expr [fragment_count t1]>100 } 1
+  do_test e_vacuum-1.2.2.2 { expr [fragment_count sqlite_autoindex_t1_1]>100 } 1
+  do_test e_vacuum-1.2.2.3 { expr [fragment_count sqlite_autoindex_t1_2]>100 } 1
+  
+  do_execsql_test e_vacuum-1.2.3 { VACUUM } {}
+  
+  # In practice, the tables and indexes each end up stored as two fragments -
+  # one containing the root page and another containing all other pages.
+  #
+  do_test e_vacuum-1.2.4.1 { fragment_count t1 }                    2
+  do_test e_vacuum-1.2.4.2 { fragment_count sqlite_autoindex_t1_1 } 2
+  do_test e_vacuum-1.2.4.3 { fragment_count sqlite_autoindex_t1_2 } 2
+}
 
 # EVIDENCE-OF: R-20474-44465 Normally, the database page_size and
 # whether or not the database supports auto_vacuum must be configured