Disable tests that use the progress handler when the progress handler

is disabled at compile-time.  Followup to ticket #2497. (CVS 4164)

FossilOrigin-Name: cbc56fd4ec60d08a13a3aa181d044e726c49ef3c

diff --git a/manifest b/manifest
index 50dec7ec24f5b0ceb34421ed9ea33b28167fd72a..1bcb714f96d1a8ba18db0635043f606098a00fc6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Preliminary\sfix\sfor\sticket\s#2518.\s\sMake\ssure\sthe\sVACUUM\scommand\nincrements\sthe\schange\scounter.\s(CVS\s4163)
-D 2007-07-19T16:35:17
+C Disable\stests\sthat\suse\sthe\sprogress\shandler\swhen\sthe\sprogress\shandler\nis\sdisabled\sat\scompile-time.\s\sFollowup\sto\sticket\s#2497.\s(CVS\s4164)
+D 2007-07-19T22:30:19
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -190,7 +190,7 @@ F test/cache.test 9e530b55ba016ca17439f728a06898f0ade5f1da
 F test/capi2.test 7ecc9b342cc9ec27b53bbf95724cf2e5874fd496
 F test/capi3.test 1cf80839d6224126acf82eb824308981fb054ef9
 F test/capi3b.test 5f0bc94b104e11086b1103b20277e1910f59c7f4
-F test/capi3c.test 007f4acbd43838c0f8e49427c6acf1cd110e381d
+F test/capi3c.test 76a3fb94755288a2977ee387e95305e6224c0198
 F test/cast.test 0302bbc8d1be2f94da1e16ad2eb01ea356e26d18
 F test/check.test e5ea0c1a06c10e81e3434ca029e2c4a562f2b673
 F test/collate1.test e3eaa48c21e150814be1a7b852d2a8af24458d04
@@ -518,7 +518,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P d1ae3de4613d36b5352eb852f1951a09d4a92ac1
-R 9a4b118d719ada76faba19f60490117c
+P 75263797e29af437290c09e85cd5fd2aea08694f
+R 88bfb3ffc2b0493ef8bd7f2ac71548aa
 U drh
-Z a495210a933458f9b08d076dceb8cb08
+Z daa0db0bb2263a39aabea796f2500945

diff --git a/manifest.uuid b/manifest.uuid
index 20027043cf6647a3b33f8ad5edc0ce4770e5c4c1..1d4fa2c29ebf66b19ace0e6c6f0bc5ac9e8536ed 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-75263797e29af437290c09e85cd5fd2aea08694f
\ No newline at end of file
+cbc56fd4ec60d08a13a3aa181d044e726c49ef3c
\ No newline at end of file

diff --git a/test/capi3c.test b/test/capi3c.test
index a3b804e7910752978eb005370820c5d2ebdcbf02..3500a818ec31c519c28726b2449190673a390e53 100644 (file)
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -13,7 +13,7 @@
 # This is a copy of the capi3.test file that has been adapted to
 # test the new sqlite3_prepare_v2 interface.
 #
-# $Id: capi3c.test,v 1.8 2007/07/12 13:18:06 danielk1977 Exp $
+# $Id: capi3c.test,v 1.9 2007/07/19 22:30:19 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -1215,31 +1215,32 @@ do_test capi3c-20.4 {
 # Test that sqlite3_step() sets the database error code correctly.
 # See ticket #2497.
 #
-do_test capi3c-21.1 {
-  set STMT [sqlite3_prepare_v2 $DB {SELECT * FROM t3} -1 TAIL]
-  db progress 5 "expr 1"
-  sqlite3_step $STMT
-} {SQLITE_INTERRUPT}
-do_test capi3c-21.2 {
-  sqlite3_errcode $DB
-} {SQLITE_INTERRUPT}
-do_test capi3c-21.3 {
-  sqlite3_finalize $STMT
-} {SQLITE_INTERRUPT}
-do_test capi3c-21.4 {
-  set STMT [sqlite3_prepare $DB {SELECT * FROM t3} -1 TAIL]
-  db progress 5 "expr 1"
-  sqlite3_step $STMT
-} {SQLITE_ERROR}
-do_test capi3c-21.5 {
-  sqlite3_errcode $DB
-} {SQLITE_ERROR}
-do_test capi3c-21.6 {
-  sqlite3_finalize $STMT
-} {SQLITE_INTERRUPT}
-do_test capi3c-21.7 {
-  sqlite3_errcode $DB
-} {SQLITE_INTERRUPT}
-
+ifcapable progress {
+  do_test capi3c-21.1 {
+    set STMT [sqlite3_prepare_v2 $DB {SELECT * FROM t3} -1 TAIL]
+    db progress 5 "expr 1"
+    sqlite3_step $STMT
+  } {SQLITE_INTERRUPT}
+  do_test capi3c-21.2 {
+    sqlite3_errcode $DB
+  } {SQLITE_INTERRUPT}
+  do_test capi3c-21.3 {
+    sqlite3_finalize $STMT
+  } {SQLITE_INTERRUPT}
+  do_test capi3c-21.4 {
+    set STMT [sqlite3_prepare $DB {SELECT * FROM t3} -1 TAIL]
+    db progress 5 "expr 1"
+    sqlite3_step $STMT
+  } {SQLITE_ERROR}
+  do_test capi3c-21.5 {
+    sqlite3_errcode $DB
+  } {SQLITE_ERROR}
+  do_test capi3c-21.6 {
+    sqlite3_finalize $STMT
+  } {SQLITE_INTERRUPT}
+  do_test capi3c-21.7 {
+    sqlite3_errcode $DB
+  } {SQLITE_INTERRUPT}
+}  
 
 finish_test