Modify test scripts to allow for the fact that zeroblob() is not available when compi...

FossilOrigin-Name: 2ee959be4afa2cf05d183ff92a31dd1b5a84becf

diff --git a/manifest b/manifest
index 422a3ec891563817d993a243cc568758ac1149f4..e51306ad1d95112c1fdb1ec30a6c04f0dcbcfee9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sSKIP_UTF16\smacros\s(they\sare\sno\slonger\sin\suse).\s(CVS\s4018)
-D 2007-05-16T18:23:05
+C Modify\stest\sscripts\sto\sallow\sfor\sthe\sfact\sthat\szeroblob()\sis\snot\savailable\swhen\scompiled\swith\sOMIT_INCRBLOB.\sTicket\s#2365.\s(CVS\s4019)
+D 2007-05-17T06:44:28
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -258,7 +258,7 @@ F test/in2.test b1f447f4f0f67e9f83ff931e7e2e30873f9ea055
 F test/incrblob.test 7f82ae497364612aa17a37f77f12e01e2bee9f20
 F test/incrblob_err.test 9dae0762ba4d73b516d176d091c6b2b16f625953
 F test/incrvacuum.test f490c8ae86f2ecca622425d02e27d3119058cb21
-F test/incrvacuum2.test a1457ad2441e49e99fbc4d74f9575dd9f7ddbde3
+F test/incrvacuum2.test 82397ceb5941cbe852fd29bb33fcdf5665bc80c2
 F test/incrvacuum_ioerr.test cb331403b8dea3c5bae6163861ff25037b0df56a
 F test/index.test e65df12bed94b2903ee89987115e1578687e9266
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
@@ -416,7 +416,7 @@ F test/where.test 5c342d6ad0d777275d4740ea5cbeaf5173b6eda4
 F test/where2.test 3249d426b3fc7a106713d784e1628307fc308d2e
 F test/where3.test 0a30fe9808b0fa01c46d0fcf4fac0bf6cf75bb30
 F test/where4.test b68496500bff496e83e76ae4ffb493b99064eac6
-F test/zeroblob.test 547d46fd17a574d4d6f1dcea5fce4c4929e165bc
+F test/zeroblob.test 204b54e8adb29f5ec466ff789734098802099d90
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/lemon.c c8c8b25ab1ac8156b3ad83ba4ea1bf00d5e07f5a
@@ -492,7 +492,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P bfc35ce8673ce51f726535b90c1d86be272848bb
-R 092e77241dcd0659d1f09286172a9e68
+P 73e654fbdc791daa10c49557bf479f152586ac28
+R c13d834540a30a1f8b30b83cb25a8ca2
 U danielk1977
-Z b95a4bc492b681e2a2f4517941526995
+Z 77d3bac28b115aab1826c7188efad160

diff --git a/manifest.uuid b/manifest.uuid
index 6a65c31b7c29c4ad64b37fa581f454cf4a719893..4f45aadd87443b92220002c5e26a360c959773f9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73e654fbdc791daa10c49557bf479f152586ac28
\ No newline at end of file
+2ee959be4afa2cf05d183ff92a31dd1b5a84becf
\ No newline at end of file

diff --git a/test/incrvacuum2.test b/test/incrvacuum2.test
index 2f59d03ea2604fa8c44a76b784f2463e3bac9045..50da7a2056165e601887c58d4cfd9d5d352685aa 100644 (file)
--- a/test/incrvacuum2.test
+++ b/test/incrvacuum2.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the incremental vacuum feature.
 #
-# $Id: incrvacuum2.test,v 1.2 2007/05/04 18:30:41 drh Exp $
+# $Id: incrvacuum2.test,v 1.3 2007/05/17 06:44:28 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -23,6 +23,16 @@ ifcapable {!autovacuum || !pragma} {
   return
 }
 
+# If the OMIT_INCRBLOB symbol was defined at compile time, there
+# is no zeroblob() function available. So create a similar
+# function here using Tcl. It doesn't return a blob, but it returns
+# data of the required length, which is good enough for this
+# test file.
+ifcapable !incrblob {
+  proc zeroblob {n} { string repeat 0 $n }
+  db function zeroblob zeroblob
+}
+
 # Create a database in incremental vacuum mode that has many
 # pages on the freelist.
 #

diff --git a/test/zeroblob.test b/test/zeroblob.test
index d797f9d899549c249b24ca6b043009fa1449f05b..69c4719ac254aa75092cacb55634ce258ef2d6d7 100644 (file)
--- a/test/zeroblob.test
+++ b/test/zeroblob.test
@@ -13,11 +13,16 @@
 # including the sqlite3_bind_zeroblob(), sqlite3_result_zeroblob(),
 # and the built-in zeroblob() SQL function.
 #
-# $Id: zeroblob.test,v 1.2 2007/05/02 16:51:59 drh Exp $
+# $Id: zeroblob.test,v 1.3 2007/05/17 06:44:29 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !incrblob {
+  finish_test
+  return
+}
+
 # When zeroblob() is used for the last field of a column, then the
 # content of the zeroblob is never instantiated on the VDBE stack.
 # But it does get inserted into the database correctly.