From: drh <>
Date: Fri, 10 Oct 2025 13:43:53 +0000 (+0000)
Subject: Fix the carrayfault.test script so that it works in configurations that
X-Git-Tag: major-release~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9d511319b98586cb430a052b0707b1a50a0454e;p=thirdparty%2Fsqlite.git

Fix the carrayfault.test script so that it works in configurations that
do not support virtual tables.

FossilOrigin-Name: 767a667b91caff2e789179231f13a0d260c9837020c0ce1553b86e88cf9aa352
---

diff --git a/manifest b/manifest
index 23287bab61..9180f286fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\s(apparently\sharmless)\sundefined\sbehavior\sin\sCARRAY\sif\sthe\srowid\nis\sused\sas\sa\sconstraint\sin\sthe\sWHERE\sclause.
-D 2025-10-10T10:40:37.616
+C Fix\sthe\scarrayfault.test\sscript\sso\sthat\sit\sworks\sin\sconfigurations\sthat\ndo\snot\ssupport\svirtual\stables.
+D 2025-10-10T13:43:53.619
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -758,7 +758,7 @@ F src/test_backup.c a2bfd90d2ff2511b8635507bdb30fa9b605ade19c16b533066cae3077f5b
 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6
 F src/test_blob.c 77b994e17f2c87055f44fd96c9a206c5a7155bae2cda2769af60c2f3582f962c
 F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5
-F src/test_config.c 7f412406592794636d6226268e26d413850a9f799bc5f3c01afc2820b165fca8
+F src/test_config.c 18aa596d37de1d5968c439fd58ebf38bc4d9c9d1db63621504e241fde375cecd
 F src/test_delete.c d0e8f6dc55cfc98a7c27c057fb88d512260564bf0b611482656c68b8f7f401ed
 F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383
 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
@@ -950,7 +950,7 @@ F test/capi3d.test 8b778794af891b0dca3d900bd345fbc8ebd2aa2aae425a9dccdd10d5233df
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
 F test/carray01.test 49e2aedfdf2c715bc002d2773cdc1217166679639542c79c8aa4115f06421407
 F test/carray02.test 9d070b54f24a34d1f3b3c552ba34db0375a9d1c4219067416fb07d1595987c9d
-F test/carrayfault.test 6b9e2f4f12236d1cf70a37c49570b9518aec4dbf8b16b01e63fba2440a1b9787
+F test/carrayfault.test 108a7d83904fc267c448e27c13b2a857c700bd6ddaa2f1e2518be718b159cb6b
 F test/cast.test a2a3b32df86e3c0601ffa2e9f028a18796305d251801efea807092dbf374a040
 F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
 F test/changes.test 4377d202a487f66fc2822c1bf57c46798c8b2caf7446f4f701723b1dbb6b86f6
@@ -2169,8 +2169,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8e7da8cf506059dde98000db2731b8c47951344263df680a12b7c95aaece2568
-R 2e24afe507e117cff2eccbac2a9985b7
+P 200b3c8f6cebf34428b0b41fc05f7361771dfee3592cfcdce512084abcc99713
+R 64a22bf76934766983a7b02a5431ca88
 U drh
-Z c48365af4aa03de9f387522386e9a4b4
+Z 04b534b446c62785db11884ab3ad6982
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 350a840b12..67b4593263 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-200b3c8f6cebf34428b0b41fc05f7361771dfee3592cfcdce512084abcc99713
+767a667b91caff2e789179231f13a0d260c9837020c0ce1553b86e88cf9aa352
diff --git a/src/test_config.c b/src/test_config.c
index bdfb31e7d8..3dbef3c9a4 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -63,6 +63,12 @@ static void set_options(Tcl_Interp *interp){
       interp, "sqlite_options", "allow_rowid_in_view", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#if defined(SQLITE_ENABLE_CARRAY)
+  Tcl_SetVar2(interp, "sqlite_options","carray","1",TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options","carray","0",TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_CASE_SENSITIVE_LIKE
   Tcl_SetVar2(interp, "sqlite_options","casesensitivelike","1",TCL_GLOBAL_ONLY);
 #else
diff --git a/test/carrayfault.test b/test/carrayfault.test
index 109dd7ee63..0dd2cd21b7 100644
--- a/test/carrayfault.test
+++ b/test/carrayfault.test
@@ -14,6 +14,10 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix carrayfault
 
+ifcapable {!carray||!vtab} {
+  finish_test; return
+}
+
 sqlite3 db test.db
 
 do_execsql_test 2.0 {