Improve testrunner.sh's handling of whitespace args #92

2025-01-20 20:58:35 +01:00 · 2021-08-30 16:37:11 +02:00 · 2021-08-30 16:37:11 +02:00 · 270d3ed7d7
commit 270d3ed7d7
parent ab9f123981
4 changed files with 5 additions and 5 deletions
--- a/test/052_simple_line_comment.txt
+++ b/test/052_simple_line_comment.txt
@ -1,5 +1,5 @@
 :ARGS
-c #
+-c "#"
 :INPUT
 a

--- a/test/084_list_design_info_for_cmdline_definition.txt
+++ b/test/084_list_design_info_for_cmdline_definition.txt
@ -1,5 +1,5 @@
 :ARGS
-c # -l
+-c "#" -l
 :INPUT
 :OUTPUT-FILTER
 :EXPECTED
--- a/test/145_tag_query_all.txt
+++ b/test/145_tag_query_all.txt
@ -1,5 +1,5 @@
 :ARGS
-f 14x_tag_query.cfg -q (all)
+-f 14x_tag_query.cfg -q "(all)"
 :INPUT
 :OUTPUT-FILTER
 :EXPECTED
--- a/test/testrunner.sh
+++ b/test/testrunner.sh
@ -94,9 +94,9 @@ fi

 echo "    Invoking: $(basename $boxesBinary) $boxesArgs"
 if [ ! -z "$BOXES_TEST_XXD" ]; then
-    cat $testInputFile | $boxesBinary $boxesArgs | xxd >$testOutputFile 2>&1
+    cat $testInputFile | eval "$boxesBinary $boxesArgs" | xxd >$testOutputFile 2>&1
 else
-    cat $testInputFile | $boxesBinary $boxesArgs >$testOutputFile 2>&1
+    cat $testInputFile | eval "$boxesBinary $boxesArgs" >$testOutputFile 2>&1
 fi
 declare -ir actualReturnCode=$?
 cat $testOutputFile | tr -d '\r' | sed -E -f $testFilterFile | diff - $testExpectationFile