Updates to e_vacuum.test so that it works when SQLITE_DEFAULT_AUTOVACUUM=1 is

set.

FossilOrigin-Name: 890816c52d688f01be9a8abd8b4c9375eed4de7e

diff --git a/manifest b/manifest
index 88bf3a961d1bae022ff9de1a4ea77398c0a2dc14..a709cd1ab1dc3e68c088b612963f00e19effaa2f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sseveral\sharmless\scompiler\swarnings.
-D 2010-09-28T14:26:36
+C Updates\sto\se_vacuum.test\sso\sthat\sit\sworks\swhen\sSQLITE_DEFAULT_AUTOVACUUM=1\sis\nset.
+D 2010-09-28T15:25:21
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -361,7 +361,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 6465a1cd3285dd0eaa29ac26b7b6830f826963ef
+F test/e_vacuum.test 057cc29445746fc1d2542984ff0253d511a234bd
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
@@ -871,14 +871,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7d0b881a6294b7f13069b2e4b69c0c0d46606505
-R 318ce9d4b610a89f23a43f85095cfae8
+P 7be03ecc04235420e54fed8a88742243278de160
+R 290accdb0db5e79ef6adc8ad0c1c3ab2
 U drh
-Z 315d077f32752e39cb3d6354c7c4da6c
+Z d9f0da0f0521a741ea8b4bc9fe098d8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMofsfoxKgR168RlERArUPAJ97tXgeCiiO59sKbJ89wIbtxdbHmwCfce27
-NQMVFnyGlKZBvssO/V+viLA=
-=apFJ
+iD8DBQFMogjkoxKgR168RlERAro3AJ47oknlBomKZ9DHVPf5lwsTWsbtLQCcCSI7
+WLk+cDDA9SY4c/BxixTlzKo=
+=GIcp
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index ff37b4b35c4f9725dae7cfebeacaa5d519a5d43d..0fd57b641a9283574710c2b3190205db5376d7cb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7be03ecc04235420e54fed8a88742243278de160
\ No newline at end of file
+890816c52d688f01be9a8abd8b4c9375eed4de7e
\ No newline at end of file

diff --git a/test/e_vacuum.test b/test/e_vacuum.test
index d44885bf682b8186556af57479957f978a1ed097..a7863c4568fe4f5b4f4497cef0fda6fd275e8fe3 100644 (file)
--- a/test/e_vacuum.test
+++ b/test/e_vacuum.test
@@ -189,14 +189,14 @@ do_test e_vacuum-1.3.3.2 {
 # EVIDENCE-OF: R-38001-03952 VACUUM only works on the main database. It
 # is not possible to VACUUM an attached database file.
 forcedelete test.db2
-create_db
+create_db { PRAGMA auto_vacuum = NONE }
 do_execsql_test e_vacuum-2.1.1 {
   ATTACH 'test.db2' AS aux;
   PRAGMA aux.page_size = 1024;
   CREATE TABLE aux.t3 AS SELECT * FROM t1;
   DELETE FROM t3;
 } {}
-do_test e_vacuum-2.1.2 { expr { ([file size test.db2] / 1024)>50 } } 1
+set original_size [file size test.db2]
 
 # Try everything we can think of to get the aux database vacuumed:
 do_execsql_test e_vacuum-2.1.3 { VACUUM } {}
@@ -204,7 +204,7 @@ do_execsql_test e_vacuum-2.1.4 { VACUUM aux } {}
 do_execsql_test e_vacuum-2.1.5 { VACUUM 'test.db2' } {}
 
 # Despite our efforts, space in the aux database has not been reclaimed:
-do_test e_vacuum-2.1.6 { expr { ([file size test.db2] / 1024)>50 } } 1
+do_test e_vacuum-2.1.6 { expr {[file size test.db2]==$::original_size} } 1
 
 # EVIDENCE-OF: R-17495-17419 The VACUUM command may change the ROWIDs of
 # entries in any tables that do not have an explicit INTEGER PRIMARY