From: drh <>
Date: Wed, 31 Jul 2024 02:01:19 +0000 (+0000)
Subject: Fix a problem with strictly conforming UTF8 in shell1.test.
X-Git-Tag: version-3.47.0~273^2~4^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4400b0ac45840d17cb5fca1ba4d173fa3982002b;p=thirdparty%2Fsqlite.git

Fix a problem with strictly conforming UTF8 in shell1.test.

FossilOrigin-Name: 8ee187f98d310e1e7cf6c3fdf000c19e98a9f11e01436c3c407df04da79aa7c0
---

diff --git a/manifest b/manifest
index 8ce4b76e10..b2153e650b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sa\sfew\stests\sthat\sdon't\swork\seven\swith\sthe\snew\sfloating\spoint\ncomparison\sroutine.
-D 2024-07-31T01:53:48.615
+C Fix\sa\sproblem\swith\sstrictly\sconforming\sUTF8\sin\sshell1.test.
+D 2024-07-31T02:01:19.346
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1616,7 +1616,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21
 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test 17a5ca9c6f24f807b2f505b4b38fcbce143d96cd8664c06c34bbbe0672bf7c30
+F test/shell1.test 490bf9d0c7c9564fea318c46d49369f4690b825b584c9a544dbdccf61bc0babc
 F test/shell2.test 56da24128304c9ab67da2964cc80beff7b35761c446ec6e6e98bff2775b15026
 F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8
 F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807
@@ -2200,8 +2200,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 71f2ee5db01150707401804b136641170e7ed44760fccec20de19184e4d0a840
-R cd4b28da8f0177e6ba3602669e9943bb
+P 895125a4895099df7c3841ca7c34697ba17fd667bddbc2fd7148f7aa9d6d2b9d
+R 29e6c2fe80c749b833106a3f129e0b0b
 U drh
-Z 107af80bed0e760d0f1a4661620a5bc3
+Z 4f162a5701a7f3bcc06c08326c1da654
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 62734ab651..2d4519b087 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-895125a4895099df7c3841ca7c34697ba17fd667bddbc2fd7148f7aa9d6d2b9d
+8ee187f98d310e1e7cf6c3fdf000c19e98a9f11e01436c3c407df04da79aa7c0
diff --git a/test/shell1.test b/test/shell1.test
index 206fb0a4fd..f355989c31 100644
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -1059,7 +1059,7 @@ do_test shell1-5.0 {
       continue
     }
     # Tcl 8.7 maps 0x80 through 0x9f into valid UTF8.  So skip those tests.
-    if {$i>=0x80 && $i<=0x9f} continue
+    if {$i>=0x80 && ($i<=0x9F || $tcl_version>=9.0)} continue
     if {$i>=0xE0 && $tcl_platform(os)=="OpenBSD"}  continue
     if {$i>=0xE0 && $i<=0xEF && $tcl_platform(os)=="Linux"}  continue
     set hex [format %02X $i]