Update to new tfkit (gdca322f)

utils/tfkit/doc/templates/grep_engine/TF_RUN

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. $TF_DIR/include/subtest.sh
-. $TF_DIR/include/tools.sh
+. "$TF_DIR/include/subtest.sh"
+. "$TF_DIR/include/tools.sh"
 
 tf_enum_subtests() {
     echo fixed

utils/tfkit/include/common.sh

@@ -102,7 +102,7 @@ tf_debug() {
     for msg in "$@";
     do
         $TF_COLOR && echo -ne "$TF_COLOR_CYAN" >&2
-        echo "||| $1" >&2;
+        echo "||| $msg" >&2;
         $TF_COLOR && echo -ne "$TF_COLOR_NONE" >&2
     done
 }
@@ -116,7 +116,7 @@ tf_think() {
     for msg in "$@";
     do
         $TF_COLOR && echo -ne "$TF_COLOR_LBLACK" >&2
-        echo "$pfx$1$sfx" >&2;
+        echo "$pfx$msg$sfx" >&2;
         $TF_COLOR && echo -ne "$TF_COLOR_NONE" >&2
     done
 }
@@ -129,7 +129,7 @@ tf_warn() {
     for msg in "$@";
     do
         $TF_COLOR && echo -ne "$TF_COLOR_LRED" >&2
-        echo "$1" >&2;
+        echo "$msg" >&2;
         $TF_COLOR && echo -ne "$TF_COLOR_NONE" >&2
     done
 }

utils/tfkit/include/harness.sh

@@ -2,7 +2,7 @@
 # ffoo test harness
 # See LICENSE file for copyright and license details.
 
-. $TF_DIR/include/common.sh
+. "$TF_DIR/include/common.sh"
 
 #
 # Default path to header generator
@@ -34,7 +34,7 @@ __tf_collect_if_needed() {
     esac
     $will || return 0
     mkdir -p "$artifact_dir/$stamp"
-    cp -r $tmpdir/* "$artifact_dir/$stamp"
+    cp -r "$tmpdir"/* "$artifact_dir/$stamp"
 }
 
 __tf_default_header() {
@@ -65,9 +65,9 @@ tf_enum_tests() {
     # List what looks like test; relative to $TF_SUITE
     #
     tf_debug "TF_SUITE='$TF_SUITE'"
-    test -d $TF_SUITE || return 0
+    test -d "$TF_SUITE" || return 0
     find -L \
-        $TF_SUITE \
+        "$TF_SUITE" \
         -mindepth 2 \
         -maxdepth 2 \
         -type f \
@@ -95,16 +95,16 @@ tf_run_tests() {
     do
         tf_think "... $tname"
         tmpdir=$(mktemp -d)
-        stamp=$(date +artifacts-$tname-%Y%m%d-%H%M%S)
+        stamp=$(date "+artifacts-$tname-%Y%m%d-%H%M%S")
         cp -r "$TF_SUITE/$tname/"* "$tmpdir"
-        pushd $tmpdir >/dev/null
+        pushd "$tmpdir" >/dev/null
             TF_DIR="$tf_dir" TF_SUITE=$tf_suite TF_TNAME="$tname" \
                 ./TF_RUN
             tes=$?
             __tf_collect_if_needed $tes
             test $tes -gt $es && es=$tes
         popd >/dev/null
-        rm -rf $tmpdir
+        rm -rf "$tmpdir"
         if test $tes -eq 0;
         then
             tf_think "''' $tname ($tes)"

utils/tfkit/include/subtest.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $TF_DIR/include/common.sh
+. "$TF_DIR/include/common.sh"
 
 tf_enum_subtests() {
     #
@@ -22,7 +22,7 @@ tf_do_subtest() {
     #
     # Run single subtest inc. setup/cleanup if present
     #
-    local subtname=$1       # this subtest name
+    local subtname="$1"     # this subtest name
     local ses=0             # subtest exit status
     local tcmd=""           # test command
     local setup=true        # setup command
@@ -31,7 +31,7 @@ tf_do_subtest() {
     test -f TF_CLEANUP && cleanup=". TF_CLEANUP"
     if $setup;
     then
-        tcmd="$(tf_name2cmd $subtname)"
+        tcmd="$(tf_name2cmd "$subtname")"
         tf_debug "tcmd='$tcmd'"
         $tcmd; ses=$?
     else

utils/tfkit/include/tools.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. $TF_DIR/include/common.sh
+. "$TF_DIR/include/common.sh"
 
 # 1. exec: [test] -> [result]
 # 2. eval:           [result] == [oracle]
@@ -30,17 +30,21 @@ tf_testflt() {
 
     # get args
     #
+    local orig_args="$0 $*"
+    tf_debug "orig_args=$orig_args"
+    local arg_err=false
     while true; do case "$1" in
-        -i) t_in="$2";          shift 2 ;;
-        -n) t_name="$2";        shift 2 ;;
-        -O) o_out="$2";         shift 2 ;;
-        -E) o_err="$2";         shift 2 ;;
-        -S) o_es="$2";          shift 2 ;;
+        -i) t_in="$2";          shift 2 || { arg_err=true; break; } ;;
+        -n) t_name="$2";        shift 2 || { arg_err=true; break; } ;;
+        -O) o_out="$2";         shift 2 || { arg_err=true; break; } ;;
+        -E) o_err="$2";         shift 2 || { arg_err=true; break; } ;;
+        -S) o_es="$2";          shift 2 || { arg_err=true; break; } ;;
         --)                     shift; break ;;
         "")                            break ;;
         -*) tf_warn "wrong testcli arg: $1"; return $TF_ES_BAILOUT ;;
         *)                             break ;;
     esac done
+    $arg_err && { tf_warn "error parsing arguments: $orig_args"; return $TF_ES_BAILOUT; }
     tf_debug "t_in='$t_in'"
     tf_debug "t_name='$t_name'"
     tf_debug "o_out='$o_out'"
@@ -53,6 +57,7 @@ tf_testflt() {
     test -r "$t_in"    || { tf_warn "missing input file: $t_in"     ; return $TF_ES_BAILOUT; }
     test -e "$o_out"   || { tf_warn "missing oracle stdout: $o_out" ; return $TF_ES_BAILOUT; }
     test -e "$o_err"   || { tf_warn "missing oracle stderr: $o_err" ; return $TF_ES_BAILOUT; }
+    test "$o_es" -ge 0 || { tf_warn "invalid oracle status: $o_es"  ; return $TF_ES_BAILOUT; }
 
     # prepare
     #
@@ -61,18 +66,18 @@ tf_testflt() {
     r_err="result/$t_name.stderr"
     tf_debug "r_out='$r_out'"
     tf_debug "r_err='$r_err'"
-    touch $r_out || { tf_warn "cannot create tmp file: $r_out" ; return $TF_ES_BAILOUT; }
-    touch $r_err || { tf_warn "cannot create tmp file: $r_err" ; return $TF_ES_PANIC; }
+    touch "$r_out" || { tf_warn "cannot create tmp file: $r_out" ; return $TF_ES_BAILOUT; }
+    touch "$r_err" || { tf_warn "cannot create tmp file: $r_err" ; return $TF_ES_PANIC; }
 
     # run
     #
-    ( <$t_in eval "$@" >$r_out 2>$r_err ); r_es=$?
+    ( <"$t_in" eval "$@" >"$r_out" 2>"$r_err" ); r_es=$?
     tf_debug "r_es='$r_es'"
 
     # eval/report/exit
     #
     test $r_es = $o_es || { tf_warn "bad exit status: $r_es (need $o_es)" ; t_es=$TF_ES_FAIL; }
-    diff -u $o_err $r_err || t_es=$TF_ES_FAIL
-    diff -u $o_out $r_out || t_es=$TF_ES_FAIL
+    diff -u "$o_err" "$r_err" || t_es=$TF_ES_FAIL
+    diff -u "$o_out" "$r_out" || t_es=$TF_ES_FAIL
     return $t_es
 }

utils/tfkit/runtests

@@ -13,12 +13,12 @@ export TF_SUITE="${TF_SUITE:-tests}"
 export TF_ARTIFACTS="${TF_ARTIFACTS:-tfkit-artifacts}"
 export TF_COLLECT="${TF_COLLECT:-auto}"
 
-. $TF_DIR/include/harness.sh \
+. "$TF_DIR/include/harness.sh" \
  || die "cannot import harness; is TF_DIR set properly?: $TF_DIR"
 
 
 usage() {
-    echo "usage: $(basename $0) [-c|-C] [-t tests_re] [-s subtest_re] [-p binpath] [-v] [-d]" >&2
+    echo "usage: $(basename "$0") [-c|-C] [-t tests_re] [-s subtest_re] [-p binpath] [-v] [-d]" >&2
     exit 2
 }