From c2ae9e650f0d3527d320ce00adb51f380f5ed6aa Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 11 Sep 2019 14:26:22 +0200
Subject: [PATCH] t: replace shell scripts by pipe parameters in name

---
 t/regress.t                                            | 10 +++++-----
 t/t0002-usage_-h.sh                                    |  2 --
 t/{t0002-usage_-h.in => t0002-usage_-h_|wc_-l.in}      |  0
 t/t0002-usage_-h_|wc_-l.out                            |  1 +
 ...aZ.in => t0003-invalid_options_-aZ_|[_$?_=_64_].in} |  0
 ....out => t0003-invalid_options_-aZ_|[_$?_=_64_].out} |  0
 6 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100755 t/t0002-usage_-h.sh
 rename t/{t0002-usage_-h.in => t0002-usage_-h_|wc_-l.in} (100%)
 create mode 100644 t/t0002-usage_-h_|wc_-l.out
 rename t/{t0003-invalid_options_-aZ.in => t0003-invalid_options_-aZ_|[_$?_=_64_].in} (100%)
 rename t/{t0003-invalid_options_-aZ.out => t0003-invalid_options_-aZ_|[_$?_=_64_].out} (100%)

diff --git a/t/regress.t b/t/regress.t
index b8d05dd..734e42d 100755
--- a/t/regress.t
+++ b/t/regress.t
@@ -33,8 +33,9 @@ do
 	test -r "$file.in" || continue
 
 	name="$(echo ${file#*-} | tr _ \ )"
-	cmd="barcat $file.in"
-	case "$name" in *\ -*) cmd="$cmd -${name#* -}";; esac
+	set -- barcat "$file.in"
+	case "$name" in *\ -*) set -- "$@" "-${name#* -}";; esac
+	case "$name" in *' |'*)  set -- sh -c "\$0 \$1 $3" "$@";; esac
 
 	if test -n "$regenerate"
 	then
@@ -43,10 +44,9 @@ do
 			echo "ok $test_count # skip $file.out"
 			continue
 		fi
-		$cmd >$file.out 2>&1
+		"$@" >$file.out 2>&1
 	else
-		if test -e $file.sh;  then $cmd 2>&1 | ./$file.sh; fi &&
-		if test -e $file.out; then $cmd 2>&1 | diffcmd "$file.out" -; fi
+		if test -e $file.out; then "$@" 2>&1 | diffcmd "$file.out" -; fi
 	fi
 
 	if test 0 != $?
diff --git a/t/t0002-usage_-h.sh b/t/t0002-usage_-h.sh
deleted file mode 100755
index 2f1d996..0000000
--- a/t/t0002-usage_-h.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-grep -q Usage:
diff --git a/t/t0002-usage_-h.in b/t/t0002-usage_-h_|wc_-l.in
similarity index 100%
rename from t/t0002-usage_-h.in
rename to t/t0002-usage_-h_|wc_-l.in
diff --git a/t/t0002-usage_-h_|wc_-l.out b/t/t0002-usage_-h_|wc_-l.out
new file mode 100644
index 0000000..7273c0f
--- /dev/null
+++ b/t/t0002-usage_-h_|wc_-l.out
@@ -0,0 +1 @@
+25
diff --git a/t/t0003-invalid_options_-aZ.in b/t/t0003-invalid_options_-aZ_|[_$?_=_64_].in
similarity index 100%
rename from t/t0003-invalid_options_-aZ.in
rename to t/t0003-invalid_options_-aZ_|[_$?_=_64_].in
diff --git a/t/t0003-invalid_options_-aZ.out b/t/t0003-invalid_options_-aZ_|[_$?_=_64_].out
similarity index 100%
rename from t/t0003-invalid_options_-aZ.out
rename to t/t0003-invalid_options_-aZ_|[_$?_=_64_].out
-- 
2.30.0