From: drh <drh@noemail.net>
Date: Sat, 2 Aug 2008 20:09:36 +0000 (+0000)
Subject: Test scripts revised to work when auto_vacuum defaults on. (CVS 5528)
X-Git-Tag: version-3.6.10~649
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6a6464895fb9d78b802ec028479163bf5151de2;p=thirdparty%2Fsqlite.git

Test scripts revised to work when auto_vacuum defaults on. (CVS 5528)

FossilOrigin-Name: e63186b0b6defce9ce16b3c334887c1f5a0bfcf0
---

diff --git a/manifest b/manifest
index 8b2253e0fb..ff9d02d0c8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sreference\scount\sleak\sintroduced\sby\s(5526).\s(CVS\s5527)
-D 2008-08-02T17:36:46
+C Test\sscripts\srevised\sto\swork\swhen\sauto_vacuum\sdefaults\son.\s(CVS\s5528)
+D 2008-08-02T20:09:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -242,10 +242,10 @@ F test/collate8.test 7ed2461305ac959886a064dc1e3cf15e155a183f
 F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a
 F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
 F test/colmeta.test 087c42997754b8c648819832241daf724f813322
-F test/colname.test 5bd677e9334a7a63615a05101b3976d79cfaf241
+F test/colname.test bc396d99a11a855370010c7e95187177592b1dfe
 F test/conflict.test bb29b052c60a1f7eb6382be77902061d1f305318
 F test/corrupt.test af069d971853dbe12af936910bfa49d92f7b16e9
-F test/corrupt2.test e56f45006e7eb3ee680ad3b61c92cc14ae09986e
+F test/corrupt2.test a6b9051516f7d417e76b6953cc02f568a6e1cbf0
 F test/corrupt3.test 263e8bb04e2728df832fddf6973cf54c91db0c32
 F test/corrupt4.test acdb01afaedf529004b70e55de1a6f5a05ae7fff
 F test/corrupt5.test 7796d5bdfe155ed824cee9dff371f49da237cfe0
@@ -380,7 +380,7 @@ F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe
 F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
-F test/jrnlmode.test b60a7dae8534ccd2e811deb09258f1172fd6e24f
+F test/jrnlmode.test 1ab9729d6bbb6fb355cbb4bb41f1f0c271fc251a
 F test/lastinsert.test 474d519c68cb79d07ecae56a763aa7f322c72f51
 F test/laststmtchanges.test 18ead86c8a87ade949a1d5658f6dc4bb111d1b02
 F test/like.test 2a3ddbd5d91503f914eabae67a47c4196fe33a58
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P fb26ae723959390a716f221af93c6c29eec16955
-R a66ca1fda9069bfc9a58362384b8ff79
-U danielk1977
-Z 28b6a6b3eaf88141513e6a1347308569
+P f653995c32197cacbcd14ea9e876ba5b2fde94df
+R ede5f4fdac184ba3807c6c0ff13cc811
+U drh
+Z c6822d32fa5f22fb4c4224795e9d09f4
diff --git a/manifest.uuid b/manifest.uuid
index 98ef41314e..b17ffc1b25 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f653995c32197cacbcd14ea9e876ba5b2fde94df
\ No newline at end of file
+e63186b0b6defce9ce16b3c334887c1f5a0bfcf0
\ No newline at end of file
diff --git a/test/colname.test b/test/colname.test
index ac2dc1849c..d2292aa5ab 100644
--- a/test/colname.test
+++ b/test/colname.test
@@ -13,7 +13,7 @@
 # The focus of this file is testing how SQLite generates the names
 # of columns in a result set.
 #
-# $Id: colname.test,v 1.3 2008/07/23 20:28:14 drh Exp $
+# $Id: colname.test,v 1.4 2008/08/02 20:09:37 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -250,9 +250,9 @@ do_test colname-4.13 {
 
 # ticket #3229
 do_test colname-5.1 {
-  db eval {
+  lreplace [db eval {
     SELECT x.* FROM sqlite_master X LIMIT 1;
-  }
-} {table tabc tabc 2 {CREATE TABLE tabc(a,b,c)}}
+  }] 3 3 x
+} {table tabc tabc x {CREATE TABLE tabc(a,b,c)}}
 
 finish_test
diff --git a/test/corrupt2.test b/test/corrupt2.test
index d20e4a9dce..35f24c64d2 100644
--- a/test/corrupt2.test
+++ b/test/corrupt2.test
@@ -13,7 +13,7 @@
 # This file implements tests to make sure SQLite does not crash or
 # segfault if it sees a corrupt database file.
 #
-# $Id: corrupt2.test,v 1.13 2008/07/08 17:13:59 danielk1977 Exp $
+# $Id: corrupt2.test,v 1.14 2008/08/02 20:09:37 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -23,6 +23,8 @@ source $testdir/tester.tcl
 #
 do_test corrupt2-1.1 {
   execsql {
+    PRAGMA auto_vacuum=0;
+    PRAGMA page_size=1024;
     CREATE TABLE abc(a, b, c);
   }
 } {}
@@ -183,6 +185,7 @@ do_test corrupt2-5.1 {
   sqlite3 db2 corrupt.db 
 
   execsql {
+    PRAGMA auto_vacuum = 0;
     PRAGMA page_size = 1024;
     CREATE TABLE t1(a, b, c);
     CREATE TABLE t2(a, b, c);
@@ -338,6 +341,7 @@ ifcapable autovacuum {
 
 
 set sqlprep {
+  PRAGMA auto_vacuum = 0;
   PRAGMA page_size = 1024;
   CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
   CREATE INDEX i1 ON t1(b);
diff --git a/test/jrnlmode.test b/test/jrnlmode.test
index cb6c3eb52a..75773dd8e6 100644
--- a/test/jrnlmode.test
+++ b/test/jrnlmode.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library. The focus
 # of these tests is the journal mode pragma.
 #
-# $Id: jrnlmode.test,v 1.4 2008/06/04 06:46:00 danielk1977 Exp $
+# $Id: jrnlmode.test,v 1.5 2008/08/02 20:09:37 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -364,8 +364,9 @@ ifcapable pragma {
   } {1}
   do_test jrnlmode-5.17 {
     execsql COMMIT
-    file size test3.db-journal
-  } $journalsize
+    set sz [file size test3.db-journal]
+    expr {$sz>=$journalsize}
+  } {1}
 
   do_test jrnlmode-5.18 {
     execsql {
@@ -378,8 +379,9 @@ ifcapable pragma {
   } {1}
   do_test jrnlmode-5.19 {
     execsql COMMIT
-    file size test.db-journal
-  } $journalsize
+    set sz [file size test.db-journal]
+    expr {$sz>=$journalsize}
+  } {1}
 }
 
 finish_test