Treat all args to --glob as a single glob.

FossilOrigin-Name: 4737bd345732e34cabbf90821e007d3027e68d6583c2e05e1e8bf5920373a6dc

diff --git a/ext/jni/src/org/sqlite/jni/tester/TestScript.java b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
index 78cb3237b1af6345881cb200fcf601d9bf7fdce5..c075ceb1a551b9ad89d66738f6be22acdadf7276 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/TestScript.java
+++ b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
@@ -137,7 +137,7 @@ class GlobCommand extends Command {
   protected GlobCommand(boolean negate){ this.negate = negate; }
 
   public void process(SQLTester t, TestScript ts, String[] argv) throws Exception{
-    argcCheck(ts,argv,1);
+    argcCheck(ts,argv,1,-1);
     t.incrementTestCounter();
     final String sql = t.takeInputBuffer();
     int rc = t.execSql(null, true, ResultBufferMode.ESCAPED,
@@ -145,7 +145,7 @@ class GlobCommand extends Command {
     final String result = t.getResultText();
     final String sArgs = Util.argvToString(argv);
     //t.verbose(argv[0]," rc = ",rc," result buffer:\n", result,"\nargs:\n",sArgs);
-    final String glob = argv[1];
+    final String glob = Util.argvToString(argv);
     rc = SQLTester.strglob(glob, result);
     if( (negate && 0==rc) || (!negate && 0!=rc) ){
       ts.toss(argv[0], " mismatch: ", glob," vs input: ",result);

diff --git a/manifest b/manifest
index 4a6014b2887e946e9a2fb87bfe27e098355ffc03..7a15348fb2b1695a2f9667ca47f494c9a126260e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\s--print's\sability\sto\sread\sahead.
-D 2023-08-10T00:58:48.754
+C Treat\sall\sargs\sto\s--glob\sas\sa\ssingle\sglob.
+D 2023-08-10T01:03:19.375
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -267,7 +267,7 @@ F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449
 F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a
 F ext/jni/src/org/sqlite/jni/tester/Outer.java b06acf9c79e8dbc8fea4a98b00724a6a76e3ee4503eb114671d2885f8fb3df8b
 F ext/jni/src/org/sqlite/jni/tester/SQLTester.java e6e4a1f78291f9b76284035dacc3d77a85f8d1a8791d7acaf201deffd771d354
-F ext/jni/src/org/sqlite/jni/tester/TestScript.java ad41031370cafe404baebb836db24b499f9b57f903646da7a70b3550e0dd8dd0
+F ext/jni/src/org/sqlite/jni/tester/TestScript.java 9f172fcffae9935c6d1c9686b3f69df199a191b7280c926bf85fa8fa30ebbddf
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md ab7169b08566a082ef55c9ef8a553827f99958ed3e076f31eef757563fae51ba
 F ext/jni/src/tests/000-000-sanity.test de89692155bee1bb35120aced6871dd6562014d0cd7c1dcf173297d8bbc03002
 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
@@ -2090,8 +2090,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 88863908ee2059c2d18a095cbd91f41674c7b0d0a8864ec21715a5317054df4d
-R 952a45c93dc1bf5ba7d98bb1afbac238
+P 15cfee972bcbd857d18ea626c9a9da64b2a445516946f3dd83c75a4f6b8a92fa
+R d87c671bcff8c274e753f8136bcb0ba4
 U stephan
-Z 43582e6a6d71574c725ca1af2b5f7e0a
+Z 3a5d0d87ef0d81bf62d0862f9674bbc7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2445e3d3c98e00631cc409c59dd44b19dcdc14f1..44b844827b2d064a0e2248cc658522a9ebc7c978 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15cfee972bcbd857d18ea626c9a9da64b2a445516946f3dd83c75a4f6b8a92fa
\ No newline at end of file
+4737bd345732e34cabbf90821e007d3027e68d6583c2e05e1e8bf5920373a6dc
\ No newline at end of file