In the test scripts, changes instances of the TCL interface

option "-has_codec" into the correct "-has-codec".

FossilOrigin-Name: f53856a555403678ea8bd721a9fa1ae179240406

diff --git a/manifest b/manifest
index 72717550397da8b6755c79ad2ebb496ee4435836..c5e66ba5c11252b2c0a635a1da4180b185183f80 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\stest\scases\sto\se_select.test.
-D 2010-09-06T18:50:55
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C In\sthe\stest\sscripts,\schanges\sinstances\sof\sthe\sTCL\sinterface\s\noption\s"-has_codec"\sinto\sthe\scorrect\s"-has-codec".
+D 2010-09-06T20:28:29
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -240,9 +243,9 @@ F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 6745008c144bd2956d58864d21f7b304689c1cce
 F test/alter.test 15f9224868b290d6bf7a63f31437f31aee070636
-F test/alter2.test 52096b711afe5f219e575c6db7a70f7a35df4f63
-F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
-F test/alter4.test 9386ffd1e9c7245f43eca412b2058d747509cc1f
+F test/alter2.test 75f731508f1bf27ba09a6075c66cd02216ba464b
+F test/alter3.test 8677e48d95536f7a6ed86a1a774744dadcc22b07
+F test/alter4.test 1e5dd6b951e9f65ca66422edff02e56df82dd403
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/analyze.test bf692e7db414f268a136bade16c03a1bdbb9240c
 F test/analyze2.test 59dac6c399c0c5d1a90a11ee7cc606743fb6db93
@@ -465,7 +468,7 @@ F test/intarray.test 066b7d7ac38d25bf96f87f1b017bfc687551cdd4
 F test/interrupt.test 42e7cf98646fd9cb4a3b131a93ed3c50b9e149f1
 F test/intpkey.test 537669fd535f62632ca64828e435b9e54e8d677f
 F test/io.test 1b895d6774491895cbc75659969f07ca01860c88
-F test/ioerr.test 390785ec65f10aa58a82b048ee12e9052d783fa8
+F test/ioerr.test e124b97c13e6fe8eac9b892b82ef3541c2cea9c7
 F test/ioerr2.test 1b56cb80d5b0726ee3ba325ca175734541e32955
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test fc6eddfec2efc2f1ed217b9eae4c1c1d3516ce86
@@ -856,7 +859,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e1d4a87e4e195b3a217f6d8a15d6beceb7c22a53
-R 0534cdf52440ad0ba2335607dfae2462
-U dan
-Z 0301c14d315e0aaf5f3d743cbab168a6
+P 9db26d5ef5a4c6f9fe0adf2ff306f6f07b6cc60c
+R e10932862ba72a33ff6a8f87f9116f0d
+U drh
+Z 024219aeef705f0a0432a5942a4c1267
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMhU7woxKgR168RlERAgD3AJwLUlw4+NeqWzbperlczwJDR543RgCfW9rR
+AqJ2Ft2qX3hILCNxsekQRaI=
+=prxb
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 97a8cdcb6d8dc4d98db8a21572a5079d2f8d6c7c..77e0c8e6579566d435c0bc72732ab01bd0842ac1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9db26d5ef5a4c6f9fe0adf2ff306f6f07b6cc60c
\ No newline at end of file
+f53856a555403678ea8bd721a9fa1ae179240406
\ No newline at end of file

diff --git a/test/alter2.test b/test/alter2.test
index b5d700de9dbe93b5794a38c3cac3e6f55307a185..712960c0eaf9e3cffacc97995329fb1bb92e993d 100644 (file)
--- a/test/alter2.test
+++ b/test/alter2.test
@@ -27,11 +27,6 @@ ifcapable {!pragma} return
 #
 do_not_use_codec
 
-# These tests do not work if there is a codec. 
-#
-#if {[catch {sqlite3 -has_codec} r] || $r} return
-#
-
 # The file format change affects the way row-records stored in tables (but 
 # not indices) are interpreted. Before version 3.1.3, a row-record for a 
 # table with N columns was guaranteed to contain exactly N fields. As

diff --git a/test/alter3.test b/test/alter3.test
index 69efc50ec7b2e7c665502a9d8ba8d664b6cdbb34..74ba33c5e1c72c95b71048a29fc9408b4ea0a0cf 100644 (file)
--- a/test/alter3.test
+++ b/test/alter3.test
@@ -28,7 +28,7 @@ ifcapable !altertable {
 
 # Determine if there is a codec available on this test.
 #
-if {[catch {sqlite3 -has_codec} r] || $r} {
+if {[catch {sqlite3 -has-codec} r] || $r} {
   set has_codec 1
 } else {
   set has_codec 0
@@ -55,6 +55,7 @@ proc get_file_format {{fname test.db}} {
 
 do_test alter3-1.1 {
   execsql {
+    PRAGMA legacy_file_format=ON;
     CREATE TABLE abc(a, b, c);
     SELECT sql FROM sqlite_master;
   }
@@ -198,6 +199,7 @@ do_test alter3-4.1 {
   file delete -force test.db
   set ::DB [sqlite3 db test.db]
   execsql {
+    PRAGMA legacy_file_format=ON;
     CREATE TABLE t1(a, b);
     INSERT INTO t1 VALUES(1, 100);
     INSERT INTO t1 VALUES(2, 300);

diff --git a/test/alter4.test b/test/alter4.test
index 992e0db6280a25e60d3bc7ad787d0b9722b1c399..738db3fd3b26012fa29262a27a37ecd741b56d03 100644 (file)
--- a/test/alter4.test
+++ b/test/alter4.test
@@ -26,14 +26,6 @@ ifcapable !altertable {
   return
 }
 
-# Determine if there is a codec available on this test.
-#
-if {[catch {sqlite3 -has_codec} r] || $r} {
-  set has_codec 1
-} else {
-  set has_codec 0
-}
-
 
 # Test Organisation:
 # ------------------
@@ -47,12 +39,6 @@ if {[catch {sqlite3 -has_codec} r] || $r} {
 # alter4-7.*: Test that VACUUM resets the file-format.
 #
 
-# This procedure returns the value of the file-format in file 'test.db'.
-# 
-proc get_file_format {{fname test.db}} {
-  return [hexio_get_int [hexio_read $fname 44 4]]
-}
-
 do_test alter4-1.1 {
   execsql {
     CREATE TEMP TABLE abc(a, b, c);
@@ -182,11 +168,6 @@ do_test alter4-3.2 {
     SELECT * FROM t1;
   }
 } {1 100 {} 2 300 {}}
-if {!$has_codec} {
-  do_test alter4-3.3 {
-    get_file_format
-  } {3}
-}
 ifcapable schema_version {
   do_test alter4-3.4 {
     execsql {
@@ -217,11 +198,6 @@ do_test alter4-4.2 {
     SELECT * FROM t1;
   }
 } {1 100 {hello world} 2 300 {hello world}}
-if {!$has_codec} {
-  do_test alter4-4.3 {
-    get_file_format
-  } {3}
-}
 ifcapable schema_version {
   do_test alter4-4.4 {
     execsql {
@@ -267,11 +243,6 @@ ifcapable attach {
       }
     } {31}
   }
-  if {!$has_codec} {
-    do_test alter4-5.5 {
-      list [get_file_format test2.db] [get_file_format]
-    } {2 3}
-  }
   do_test alter4-5.6 {
     execsql {
       ALTER TABLE aux.t1 ADD COLUMN d DEFAULT 1000;
@@ -333,42 +304,6 @@ ifcapable trigger&&tempdb {
   } {b 1 2 a 1 2 b 3 4 a 3 4}
 }
 
-if {!$has_codec} {
-  ifcapable vacuum {
-    do_test alter4-7.1 {
-      execsql {
-        VACUUM;
-      }
-      get_file_format
-    } {1}
-    do_test alter4-7.2 {
-      execsql {
-        CREATE TEMP TABLE abc(a, b, c);
-        ALTER TABLE abc ADD d DEFAULT NULL;
-      }
-      get_file_format
-    } {2}
-    do_test alter4-7.3 {
-      execsql {
-        ALTER TABLE abc ADD e DEFAULT 10;
-      }
-      get_file_format
-    } {3}
-    do_test alter4-7.4 {
-      execsql {
-        ALTER TABLE abc ADD f DEFAULT NULL;
-      }
-      get_file_format
-    } {3}
-    do_test alter4-7.5 {
-      execsql {
-        VACUUM;
-      }
-      get_file_format
-    } {1}
-  }
-}
-
 # Ticket #1183 - Make sure adding columns to large tables does not cause
 # memory corruption (as was the case before this bug was fixed).
 do_test alter4-8.1 {

diff --git a/test/ioerr.test b/test/ioerr.test
index 21052e412058b4dcbfeff3b24cbeddfed2834aac..311515302d875ac49ae4268cbbc7f47eb4511fc6 100644 (file)
--- a/test/ioerr.test
+++ b/test/ioerr.test
@@ -136,7 +136,7 @@ ifcapable attach {
 # Test IO errors when replaying two hot journals from a 2-file 
 # transaction. This test only runs on UNIX.
 ifcapable crashtest&&attach {
-  if {![catch {sqlite3 -has_codec} r] && !$r} {
+  if {![catch {sqlite3 -has-codec} r] && !$r} {
     do_ioerr_test ioerr-6 -ckrefcount true -tclprep {
       execsql {
         ATTACH 'test2.db' as aux;