Move the test command body's trim() back into the TestScript class (to simplify Comma...

FossilOrigin-Name: f15ecb68f7ca129478336b462508d2c40ea052b4040facefdbc67b13e6aea99d

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index c6805cf54031c37069d1e93251d66d624cdc8e0f..308a5259dccc502eacbdf69ff4a7ba40a2fbe476 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -572,7 +572,7 @@ class GlobCommand extends Command {
     //t.verbose(argv[0]," SQL =\n",sql);
     int rc = t.execSql(null, true, ResultBufferMode.ESCAPED,
                        ResultRowMode.ONELINE, sql);
-    final String result = t.getResultText().trim();
+    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];

diff --git a/ext/jni/src/org/sqlite/jni/tester/TestScript.java b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
index 45195d331495708096231f2794446488201be4d6..1e55c82fffa9ef702ab5459b093c903e5e235d05 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/TestScript.java
+++ b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
@@ -249,7 +249,10 @@ class TestScript {
           }
           outer.out("\n");
         }
-        CommandDispatcher.dispatch(tester, chunk.argv, chunk.content);
+        CommandDispatcher.dispatch(
+          tester, chunk.argv,
+          (null==chunk.content) ? null : chunk.content.trim()
+        );
       }
     }
   }

diff --git a/ext/jni/src/tests/000_first.test b/ext/jni/src/tests/000_first.test
index 0382c14ec0967f6a45ba041b265997ab7ed926c4..bcd78a27a3f1958cd9736206706566f147469b77 100644 (file)
--- a/ext/jni/src/tests/000_first.test
+++ b/ext/jni/src/tests/000_first.test
@@ -24,6 +24,7 @@ Also from the print command.
   SELECT '{}', 'f';
   SELECT '{    }', 'g';
   SELECT '(a-b-c)', '[a-b-c]';
+  -- this comment must not cause an error
 --result {a b} c d e "{}" f "{\011}" g (a-b-c) [a-b-c]
 --testcase 2
   SELECT 123

diff --git a/manifest b/manifest
index 97c6167cc3088202b7760f96620740acb6c1585f..990dac6e0174dd26081afe09e80d8ae9012d7a8a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tweak\sthe\sSQLTester\s--verbose\sand\sdouble-verbose\soutput\sa\sbit\sfor\slegibility.
-D 2023-08-09T16:56:42.764
+C Move\sthe\stest\scommand\sbody's\strim()\sback\sinto\sthe\sTestScript\sclass\s(to\ssimplify\sCommand-level\scode)\sbut\sdo\sit\safter\sdouble-verbose\shas\shad\sthe\schance\sto\semit\sit\sas-is\s(so\sthat\sdebug\soutput\sis\snot\smangled\sby\sthe\strim).
+D 2023-08-09T17:04:58.035
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -266,10 +266,10 @@ F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e907859
 F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc
 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 d36900bd9d1b7c9ac07d23fe2344b1f422b6556ef40da7ab3f5de457f63a2cf8
-F ext/jni/src/org/sqlite/jni/tester/TestScript.java e0a4b523ba2b207e01684dc65ee8d0212bb1d60242dcdff99c4d8eb326b79628
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java e6753941ce1d344396aa3adf7823fb76130d3f3a0c5f02b57d293370886e057f
+F ext/jni/src/org/sqlite/jni/tester/TestScript.java 14f6e5df11b0d0f1357e72c0588171589583cbb8cf212b739d202ea17fdaada7
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md 44449866970341076cec355193f89646825270a2f4f4073b55150cc4a55100d4
-F ext/jni/src/tests/000_first.test 66dd69f5412b87b063982d1aad6907fbe472bc627ca863ae33145e4f54499b8a
+F ext/jni/src/tests/000_first.test cd5fb732520cf36d7a3e5ad94a274c7327a9504b01a1a7f98e1f946df6c539fd
 F ext/jni/src/tests/010_ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9
 F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013
@@ -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 0770e8467d4bb9490d9ed6e8a20766ffee7049cc3667db6d036c13fccbb6f3ab
-R b42664702ccf0865a1d128b95361cc2b
+P 46b79afaafda40cb1f920cc96600adf11e8c688184c9559a08eb86776ccf3663
+R 95e2df2649b37210ba0f30bd88f841aa
 U stephan
-Z a06e0ef26142b9f73cf2ce24e37e2e96
+Z 6db045beedb4bf3da5e485334e151e20
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 5a8256b9f400899b42410d28363b602145177d06..3a62236169704e90eed61485dcac7e6bd0e2e435 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46b79afaafda40cb1f920cc96600adf11e8c688184c9559a08eb86776ccf3663
\ No newline at end of file
+f15ecb68f7ca129478336b462508d2c40ea052b4040facefdbc67b13e6aea99d
\ No newline at end of file