Changes to cleanup and improve the consistency of tests for large file support in...

FossilOrigin-Name: 3dbdf68030855a5da24de0ae2f10a26da2531d33

diff --git a/manifest b/manifest
index d2a1670f5f9c3f0d4a7863a049f4f0e3edeb92dd..590286028507cf43fa1f9ca4fbf702f8462a65f3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\ssome\sasserts\sand\sa\scheck\sfor\sa\snull\spointer\sdereference.\s(CVS\s6337)
-D 2009-03-05T04:23:47
+C Changes\sto\scleanup\sand\simprove\sthe\sconsistency\sof\stests\sfor\slarge\sfile\ssupport\sin\sbigfile.test.\s(CVS\s6338)
+D 2009-03-05T04:27:08
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -238,7 +238,7 @@ F test/backup_ioerr.test a9b8084e488154341719833783ac9db321e14284
 F test/backup_malloc.test 1e063c6d75143d0d6e0ae77971dd690070369387
 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
 F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070
-F test/bigfile.test 6adfef13d24bbe0c504b4547f292b9a170184f25
+F test/bigfile.test b746a34ce0e2039994b45fea8b7fbfa78f594cdf
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
 F test/bind.test 455f7e8322a215e245414625eede3ab0e1429c14
 F test/bindxfer.test d4f573750e06c34ef2309acb95ad57da1d3c983f
@@ -703,7 +703,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 6404afa0c515a6536fc2e878d4fb451e4dc06942
-R cb451a376a875ee944efaf55ae11f3de
+P 6b0cabd017ed25530b2d918d2c069fcbdd60a3f6
+R fee3d718417bd5cb78c4e8b1c7f65105
 U shane
-Z d69fdde0ff0618397c68c7c25c50fbef
+Z 736b679812172868a9aa6eb0fad79522

diff --git a/manifest.uuid b/manifest.uuid
index 6b7a4ce7a8e640194336df158fc92df13452b9e9..3ee264f483998928413596b72462d7c6218e8e26 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6b0cabd017ed25530b2d918d2c069fcbdd60a3f6
\ No newline at end of file
+3dbdf68030855a5da24de0ae2f10a26da2531d33
\ No newline at end of file

diff --git a/test/bigfile.test b/test/bigfile.test
index a036e6d0ceb0861816759d45886588225ca0f20c..24a92c5c0cc12cf9b97f0f6b94ad512dcbb5b051 100644 (file)
--- a/test/bigfile.test
+++ b/test/bigfile.test
@@ -12,7 +12,7 @@
 # focus of this script testing the ability of SQLite to handle database
 # files larger than 4GB.
 #
-# $Id: bigfile.test,v 1.11 2008/11/21 22:21:51 drh Exp $
+# $Id: bigfile.test,v 1.12 2009/03/05 04:27:08 shane Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -66,7 +66,6 @@ do_test bigfile-1.1 {
 db close
 if {[catch {fake_big_file 4096 [pwd]/test.db} msg]} {
   puts "**** Unable to create a file larger than 4096 MB. *****"
-  puts "$msg"
   finish_test
   return
 }
@@ -83,7 +82,11 @@ do_test bigfile-1.2 {
 # tests.  We will know the above test failed because the "db" command
 # does not exist.
 #
-if {[llength [info command db]]>0} {
+if {[llength [info command db]]<=0} {
+  puts "**** Large file support appears to be broken. *****"
+  finish_test
+  return
+}
 
 do_test bigfile-1.3 {
   execsql {
@@ -98,11 +101,6 @@ do_test bigfile-1.4 {
     SELECT md5sum(x) FROM t1;
   }
 } $::MAGIC_SUM
-do_test bigfile-1.5 {
-  execsql {
-    SELECT md5sum(x) FROM t2;
-  }
-} $::MAGIC_SUM
 
 db close
 if {[catch {fake_big_file 8192 [pwd]/test.db}]} {
@@ -111,12 +109,18 @@ if {[catch {fake_big_file 8192 [pwd]/test.db}]} {
   return
 }
 
-do_test bigfile-1.6 {
+do_test bigfile-1.5 {
   sqlite3 db test.db
   execsql {
     SELECT md5sum(x) FROM t1;
   }
 } $::MAGIC_SUM
+do_test bigfile-1.6 {
+  sqlite3 db test.db
+  execsql {
+    SELECT md5sum(x) FROM t2;
+  }
+} $::MAGIC_SUM
 do_test bigfile-1.7 {
   execsql {
     CREATE TABLE t3 AS SELECT * FROM t1;
@@ -135,11 +139,6 @@ do_test bigfile-1.9 {
     SELECT md5sum(x) FROM t2;
   }
 } $::MAGIC_SUM
-do_test bigfile-1.10 {
-  execsql {
-    SELECT md5sum(x) FROM t3;
-  }
-} $::MAGIC_SUM
 
 db close
 if {[catch {fake_big_file 16384 [pwd]/test.db}]} {
@@ -148,33 +147,40 @@ if {[catch {fake_big_file 16384 [pwd]/test.db}]} {
   return
 }
 
-do_test bigfile-1.11 {
+do_test bigfile-1.10 {
   sqlite3 db test.db
   execsql {
     SELECT md5sum(x) FROM t1;
   }
 } $::MAGIC_SUM
+do_test bigfile-1.11 {
+  sqlite3 db test.db
+  execsql {
+    SELECT md5sum(x) FROM t2;
+  }
+} $::MAGIC_SUM
 do_test bigfile-1.12 {
+  sqlite3 db test.db
   execsql {
-    CREATE TABLE t4 AS SELECT * FROM t1;
-    SELECT md5sum(x) FROM t4;
+    SELECT md5sum(x) FROM t3;
   }
 } $::MAGIC_SUM
 do_test bigfile-1.13 {
-  db close
-  sqlite3 db test.db
   execsql {
-    SELECT md5sum(x) FROM t1;
+    CREATE TABLE t4 AS SELECT * FROM t1;
+    SELECT md5sum(x) FROM t4;
   }
 } $::MAGIC_SUM
 do_test bigfile-1.14 {
+  db close
+  sqlite3 db test.db
   execsql {
-    SELECT md5sum(x) FROM t2;
+    SELECT md5sum(x) FROM t1;
   }
 } $::MAGIC_SUM
 do_test bigfile-1.15 {
   execsql {
-    SELECT md5sum(x) FROM t3;
+    SELECT md5sum(x) FROM t2;
   }
 } $::MAGIC_SUM
 do_test bigfile-1.16 {
@@ -182,12 +188,5 @@ do_test bigfile-1.16 {
     SELECT md5sum(x) FROM t3;
   }
 } $::MAGIC_SUM
-do_test bigfile-1.17 {
-  execsql {
-    SELECT md5sum(x) FROM t4;
-  }
-} $::MAGIC_SUM
-
-} ;# End of the "if( db command exists )"
 
 finish_test