Update TFKit to v0.0.17

utils/tfkit/include/common.sh

@@ -1,3 +1,6 @@
+#!/bin/bash
+#shellcheck disable=SC2034,SC1117
+
 #
 # Variables to hold exit status semantic
 #
@@ -123,7 +126,7 @@ tf_think() {
     for msg in "$@";
     do
         $TF_COLOR && echo -ne "$TF_COLOR_LBLACK" >&2
-        echo "$pfx$msg$sfx" >&2;
+        echo "$msg" >&2;
         $TF_COLOR && echo -ne "$TF_COLOR_NONE" >&2
     done
 }

utils/tfkit/include/harness.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
+#shellcheck disable=SC1090
 # tfkit - Shellfu's movable test framework
 # See LICENSE file for copyright and license details.
 
+#shellcheck disable=SC2153
 . "$TF_DIR/include/common.sh"
 
 
@@ -104,7 +106,7 @@ tf_run_tests() {
         tmpdir=$(mktemp -d)
         stamp=$(date "+relics-$tname-%Y%m%d-%H%M%S")
         cp -r "$TF_SUITE/$tname/"* "$tmpdir"
-        pushd "$tmpdir" >/dev/null
+        pushd "$tmpdir" >/dev/null || tf_exit_panic "could not chdir to: $tmpdir"
             TF_DEBUG=$TF_DEBUG TF_VERBOSE=$TF_VERBOSE \
             TF_DIR="$tf_dir" TF_TEST="$tname" \
             TF_FILTER_SUBTEST=$TF_FILTER_SUBTEST \
@@ -112,7 +114,7 @@ tf_run_tests() {
             tes=$?
             __tf_collect_if_needed $tes
             test $tes -gt $es && es=$tes
-        popd >/dev/null
+        popd >/dev/null || tf_exit_panic "could not chdir from: $tmpdir to $OLDPWD"
         rm -rf "$tmpdir"
         if test $tes -eq 0;
         then

utils/tfkit/include/subtest.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+#shellcheck disable=SC1090
 
 . "$TF_DIR/include/common.sh"
 

utils/tfkit/include/tools.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+#shellcheck disable=SC1090
 
 . "$TF_DIR/include/common.sh"
 
@@ -10,10 +11,10 @@ tf_testflt() {
     # Run a simple test for a unix filter
     #
     #     tf_testflt -n foo [-i foo.stdin] \
-    #                [-O foo.stdout] [-E foo.stderr] [-S 3] \
+    #                [-O foo.out] [-E foo.err] [-S 3] \
     #                cmd arg...
     #
-    # Will drop *result/NAME.stdout* and *result/NAME.stderr* (intentionally
+    # Will drop *result/NAME.out* and *result/NAME.err* (intentionally
     # not cleaning up).
     #
 
@@ -44,10 +45,10 @@ tf_testflt() {
         -S) o_es="$2";          shift 2 || { arg_err=true; break; } ;;
         --)                     shift; break ;;
         "")                            break ;;
-        -*) tf_warn "wrong testcli arg: $1"; return $TF_ES_BAILOUT ;;
+        -*) 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; }
+    $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'"
@@ -55,22 +56,22 @@ tf_testflt() {
     tf_debug "o_es='$o_es'"
     tf_debug "test command: $*"
     test "$t_in" = "-" && t_in=/dev/stdin   # works better for check below
-    test -z "$t_name"  && { tf_warn "missing test name"             ; return $TF_ES_BAILOUT; }
-    test -z "$1"       && { tf_warn "missing test command"          ; return $TF_ES_BAILOUT; }
-    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; }
+    test -z "$t_name"  && { tf_warn "missing test name"             ; return "$TF_ES_BAILOUT"; }
+    test -z "$1"       && { tf_warn "missing test command"          ; return "$TF_ES_BAILOUT"; }
+    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
     #
     mkdir -p result
-    r_out="result/$t_name.stdout"
-    r_err="result/$t_name.stderr"
+    r_out="result/$t_name.out"
+    r_err="result/$t_name.err"
     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
     #
@@ -79,8 +80,8 @@ tf_testflt() {
 
     # eval/report/exit
     #
-    test $r_es = $o_es || { tf_warn "bad exit status: $r_es (need $o_es)" ; t_es=$TF_ES_FAIL; }
+    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
-    return $t_es
+    return "$t_es"
 }

utils/tfkit/runtests

@@ -1,8 +1,9 @@
 #!/bin/bash
+#shellcheck disable=SC1090
 # tfkit - Shellfu's movable test framework
 # See LICENSE file for copyright and license details.
 
-TF_VERSION="0.0.16"
+TF_VERSION="0.0.17"
 
 die() {
     echo "$@" && exit 9
@@ -75,8 +76,8 @@ main() {
         -c|--collect)           TF_COLLECT=always;          shift ;;
         -C|--no-collect)        TF_COLLECT=never;           shift ;;
         -d|--debug)             TF_DEBUG=true;              shift ;;
-        -p|--prefix)            export PATH="$(readlink -f "$2")/bin:$PATH"
-                                                            shift 2 || usage ;;
+        -p|--prefix)            PATH="$(readlink -f "$2")/bin:$PATH"
+                                export PATH;                shift 2 || usage ;;
         -s|--filter-subtest)    TF_FILTER_SUBTEST="$2";     shift 2 || usage ;;
         -t|--filter-test)       TF_FILTER_TEST="$2";        shift 2 || usage ;;
         -v|--verbose)           TF_VERBOSE=true;            shift ;;