Added back testing with socat as a fallback option

1 files changed, 42 insertions, 3 deletions

diff --git a/src/testzzuf/zzuf_test_runner.sh b/src/testzzuf/zzuf_test_runner.sh
index aa1dfdde..40367639 100755
--- a/src/testzzuf/zzuf_test_runner.sh
+++ b/src/testzzuf/zzuf_test_runner.sh
@@ -13,6 +13,40 @@ if command -v "${ZZUF}" > /dev/null 2>&1 ; then : ; else
   exit 77
 fi
 
+run_with_socat ()
+{
+  echo "Trying to run the test with socat..."
+  script_dir=""
+  if command -v dirname > /dev/null 2>&1 ; then
+    test_dir=`dirname /`
+    if test "x${test_dir}" = "x/" ; then
+      if dirname "$1" > /dev/null 2>&1 ; then
+        script_dir=`dirname "$1"`
+        if test -n "${script_dir}" ; then
+          # Assume script is not in the root dir
+          script_dir="${script_dir}/"
+        else
+          script_dir="./"
+        fi
+      fi
+    fi
+  fi
+  if test -z "${script_dir}" ; then
+    if echo "$1" | sed 's|[^/]*$||' > /dev/null 2>&1 ; then
+      script_dir=`echo "$1" | sed 's|[^/]*$||'`
+        if test -z "${script_dir}" ; then
+          script_dir="./"
+        fi
+    fi
+  fi
+  if test -z "${script_dir}" ; then
+    echo "Cannot determine script location, will try current directory." 1>&2
+    script_dir="./"
+  fi
+  $SHELL "${script_dir}zzuf_socat_test_runner.sh" "$@"
+  exit $?
+}
+
 # zzuf cannot pass-through the return value of checked program
 # so try the direct dry-run first to get possibe 77 or 99 codes
 echo "## Dry-run of the $@..."
@@ -20,7 +54,11 @@ if "$@" --dry-run ; then
   echo "# Dry-run succeded."
 else
   res_code=$?
-  echo "Dry-run failed with exit code $res_code. $@ will not be run with zzuf." 1>&2
+  echo "Dry-run failed with exit code $res_code." 1>&2
+  if test $res_code -ne 99; then
+    run_with_socat "$@"
+  fi
+  echo "$@ will not be run with zzuf." 1>&2
   exit $res_code
 fi
 
@@ -46,8 +84,9 @@ if "$ZZUF" ${zzuf_all_params} "$@" --dry-run ; then
   echo "# Dry-run with zzuf succeded."
 else
   res_code=$?
-  echo "$@ cannot be run with zzuf. The test is skipped." 1>&2
-  exit 77
+  echo "$@ cannot be run with zzuf directly." 1>&2
+  run_with_socat "$@"
+  exit $res_code
 fi
 
 echo "## Real test of $@ with zzuf..."