Fix countofview.test so that it works with SQLITE_OMIT_PROGRESS_CALLBACK builds.

FossilOrigin-Name: d55a7742c9447eba20a7fe252fb3edcabba3793030a55976d5a5e6c65bce7706

diff --git a/manifest b/manifest
index 5d294ea9349ea8310c929464a14be4455fa3d895..14cf93a8aa6429c15fd3ce86e7d40ef409bb5fa5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sversion\snumber\sto\s3.41.1
-D 2023-03-09T14:14:18.975
+C Fix\scountofview.test\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_PROGRESS_CALLBACK\sbuilds.
+D 2023-03-09T15:08:56.667
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -891,7 +891,7 @@ F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c
 F test/corruptN.test 7c099d153a554001b4fb829c799b01f2ea6276cbc32479131e0db0da4efd9cc4
 F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
 F test/count.test cd4bd531066e8d77ef8fe1e3fc8253d042072e117ccab214b290cf83f1602249
-F test/countofview.test 5ecb4ab5449683c5eaa315620fc17838c0f2a58001f3979fcdf9f56cd6af83f5
+F test/countofview.test f9025dba8a9bb673a1f3ce25405900f630f81592c226546242df1ef1e62d0192
 F test/coveridxscan.test f35c7208dedc4f98e471c569df64c0f95a49f6e072d8dc7c8f99bdee2697de1b
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
 F test/crash2.test 5b14d4eb58b880e231361d3b609b216acda86651
@@ -2045,8 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cbbe8986ea26e78a7c5b122170cb5bf3f275f8e3a2941017f9ef11d7f3864256
-R 5e52896f259783ce1b93045551c62410
-U drh
-Z cdd5d9f44c25895cdcef9493cc73d272
+P e4e2e64725a196ee4f287649db33f49fd7329c95cef3ce743cd177c998a6a343
+Q +2fc7c3fcee05c2a251ceb3666f3f6e9014cfe6e2f8570b72c43f251067e6b252
+R 53da1bf93f2f919c47eb8511c942a273
+U dan
+Z ceb9f98a8348af253cc47acc64f81e23
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 00c71736624766b4bfeed5622403a488dee7e2bc..4f5ea50ac3e898a0abc70caefd4eaf97334120f9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4e2e64725a196ee4f287649db33f49fd7329c95cef3ce743cd177c998a6a343
\ No newline at end of file
+d55a7742c9447eba20a7fe252fb3edcabba3793030a55976d5a5e6c65bce7706
\ No newline at end of file

diff --git a/test/countofview.test b/test/countofview.test
index bc5633f7a5d71404c0581666253dd9a321065c47..7e94fa5ee75361e6d1d7818412be9a13fa4cf681 100644 (file)
--- a/test/countofview.test
+++ b/test/countofview.test
@@ -54,12 +54,14 @@ do_execsql_test 2.1 {
 # 2023-03-01 dbsqlfuzz ef8623915d843b150c159166ee4548c78cc6895a
 # count-of-view should not apply to CTEs.
 #
-proc progress_stop args {return 1}
-db progress 1000 progress_stop
-do_catchsql_test 3.1 {
-  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c)
-  SELECT count(*) FROM c;
-} {1 interrupted}
+ifcapable progress {
+  proc progress_stop args {return 1}
+  db progress 1000 progress_stop
+  do_catchsql_test 3.1 {
+    WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c)
+    SELECT count(*) FROM c;
+  } {1 interrupted}
+}
 
 # 2023-03-07 dbsqlfuzz 23d782160b71c3f8f535ccb2da313dfc8eb8c631
 #