From: stephan <stephan@noemail.net>
Date: Wed, 9 Aug 2023 22:30:10 +0000 (+0000)
Subject: Correct REQUIRED_PROPERTIES handling to not fail if there are no properties.
X-Git-Tag: version-3.43.0~47^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35af4c5ff1dfa1f41e9239a74db90c9fa48f486a;p=thirdparty%2Fsqlite.git

Correct REQUIRED_PROPERTIES handling to not fail if there are no properties.

FossilOrigin-Name: 7a19bef4f572a90fb7896b9360f9c72b052955ca9b0549be870b2b245c1f1b2b
---

diff --git a/ext/jni/src/org/sqlite/jni/tester/TestScript2.java b/ext/jni/src/org/sqlite/jni/tester/TestScript2.java
index 013c46cd12..07533a6d4a 100644
--- a/ext/jni/src/org/sqlite/jni/tester/TestScript2.java
+++ b/ext/jni/src/org/sqlite/jni/tester/TestScript2.java
@@ -337,7 +337,7 @@ class TestScript2 {
   }
 
   private static final Pattern patternRequiredProperties =
-    Pattern.compile(" REQUIRED_PROPERTIES:[ \\t]*(.*+)\\s*$");
+    Pattern.compile(" REQUIRED_PROPERTIES:[ \\t]*(\\S.*)\\s*$");
   private static final Pattern patternScriptModuleName =
     Pattern.compile(" SCRIPT_MODULE_NAME:[ \\t]*(\\S+)\\s*$");
   private static final Pattern patternMixedModuleName =
diff --git a/ext/jni/src/tests/000-000-sanity.test2 b/ext/jni/src/tests/000-000-sanity.test2
index 241305c0f8..5511291878 100644
--- a/ext/jni/src/tests/000-000-sanity.test2
+++ b/ext/jni/src/tests/000-000-sanity.test2
@@ -5,6 +5,7 @@
 ** xMIXED_MODULE_NAME:       mixed-module
 ** xMODULE_NAME:             module-name
 ** xREQUIRED_PROPERTIES:      small fast reliable
+** REQUIRED_PROPERTIES:
 **
 */
 
diff --git a/manifest b/manifest
index 93a495d6f2..cd7f7de5bb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sfor\sthe\sSQLTester\srework.\sCan\sread\sinput\sand\sdispatch\scommands,\sbut\sonly\s--print\sis\scurrently\simplemented.
-D 2023-08-09T22:18:22.852
+C Correct\sREQUIRED_PROPERTIES\shandling\sto\snot\sfail\sif\sthere\sare\sno\sproperties.
+D 2023-08-09T22:30:10.275
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -268,9 +268,9 @@ F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e8597
 F ext/jni/src/org/sqlite/jni/tester/Outer.java b06acf9c79e8dbc8fea4a98b00724a6a76e3ee4503eb114671d2885f8fb3df8b
 F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 2663dffe3977b73730ba3cbdd6dc0fe053699479759b75bb46c1f966773f0b76
 F ext/jni/src/org/sqlite/jni/tester/TestScript.java 463021981a65ffe7147a1bfada557b275b0cba3c33176ac328502ff09d146f28
-F ext/jni/src/org/sqlite/jni/tester/TestScript2.java f01faf9facbc029f5baf731edf5de37cdd2921ec55ca4d8bd1e764c13211828f
+F ext/jni/src/org/sqlite/jni/tester/TestScript2.java 3fc6700ab92e614f61856eeb87469589e57342cb66f5c4f9de425b45425f278f
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md ab7169b08566a082ef55c9ef8a553827f99958ed3e076f31eef757563fae51ba
-F ext/jni/src/tests/000-000-sanity.test2 8cb312a3dde4d09ead6a33a056ef685a99225b18635a07d03fa21d83879fb1c0
+F ext/jni/src/tests/000-000-sanity.test2 dca0364ca25dacdff38355870fee51be7112eade930b3597c808c2f88c44a782
 F ext/jni/src/tests/000_first.test cd5fb732520cf36d7a3e5ad94a274c7327a9504b01a1a7f98e1f946df6c539fd
 F ext/jni/src/tests/010_ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9
@@ -2092,8 +2092,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 43534cd042499c1bef44ca5c4a8305a710d99e70e8b0adce6df50c6a1f0402b9
-R 02b26ab163237a92c9aeaab8dbe6493d
+P 4fa2ad33edbcef393dd98dbf90586ad8f32ec0beab02f197c8038a44be86c314
+R c8b3185b3c963903b037db53ffaa5711
 U stephan
-Z 4fb10f0d619801f5f787d45bc947ea2c
+Z f51d1e9a0eee42db59afa92b063b01d4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c6f2dd21f8..c0b4f14f97 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4fa2ad33edbcef393dd98dbf90586ad8f32ec0beab02f197c8038a44be86c314
\ No newline at end of file
+7a19bef4f572a90fb7896b9360f9c72b052955ca9b0549be870b2b245c1f1b2b
\ No newline at end of file