X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=test%2Fcommon.sh;h=d195a7cf5d24b35d81c0b6e5e18ccc06602f4473;hp=1c675e20f6118c04c07c35cb0fb4e8c5b0754d32;hb=b6823062c9806496b39ff12bf1fbe43ae127c96c;hpb=dba2e3c8f09a64ebf3c07323f1cb5fb2fa611d12

diff --git a/test/common.sh b/test/common.sh
index 1c675e2..d195a7c 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -1,33 +1,111 @@
-# Common helper routines for test shell scripts -- intended to be sourced by them
-test_skip ()
+# Common helper routines for test shell scripts
+# -- intended to be sourced by them
+
+tmpfile="`mktemp`"
+trap '
+	rm -f "$tmpfile"
+	exit "$failed"
+' 0 1 2 15
+failed=0
+
+
+test_skip()
 {
-  WHY="$1"
-  echo "$Test $0 SKIP ($WHY)"
-  exit 120
+	echo "$0: $1"
+	failed=120
+	exit
 }
 
 # portable implementation of 'which' utility
 findprog()
 {
-  FOUND=
-  PROG="$1"
-  IFS_SAVE="$IFS"
-  IFS=:
-  for D in $PATH; do
-    if [ -z "$D" ]; then
-      D=.
-    fi
-    if [ -f "$D/$PROG" ] && [ -x "$D/$PROG" ]; then
-      printf '%s\n' "$D/$PROG"
-      break
-    fi
-  done
-  IFS="$IFS_SAVE"
-}
-
-require_prog ()
-{
-  if [ -z "$(findprog $1)" ]; then
-    test_skip "missing $1"
-  fi
+	FOUND=
+	PROG="$1"
+	IFS_SAVE="$IFS"
+	IFS=:
+	for D in $PATH; do
+		if [ -z "$D" ]; then
+			D=.
+		fi
+		if [ -f "$D/$PROG" ] && [ -x "$D/$PROG" ]; then
+			printf '%s\n' "$D/$PROG"
+			break
+		fi
+	done
+	IFS="$IFS_SAVE"
+}
+
+require_prog()
+{
+	if [ -z "$(findprog $1)" ]; then
+		test_skip "missing $1"
+	fi
+}
+
+require_locale()
+{
+	for locale in "$@"; do
+		if locale -a | grep -i "$locale" >/dev/null; then
+			return
+		fi
+	done
+	test_skip "no suitable locale available"
+}
+
+# Some stuff for doing silly progress indicators
+progress_update()
+{
+	test -t 1 || return 0   # supress progress meter if non-interactive
+	this="$1"
+	first="$2"
+	last="$3"
+	range="$(expr $last - $first ||:)"
+	prog="$(expr $this - $first ||:)"
+	# this automatically rounds to nearest integer
+	perc="$(expr 100 \* $prog / $range ||:)"
+	# note \r so next update will overwrite
+	printf "%3d%%\r" $perc
+}
+
+progress_done()
+{
+	test -t 1 || return 0   # supress progress meter if non-interactive
+	printf "100%%\n"
+}
+
+
+
+#### Filter that squeezes blank lines, partially emulating GNU cat -s,
+#### but sufficient for our purpose.
+#### From http://www-rohan.sdsu.edu/doc/sed.html, compiled by Eric Pement.
+squeeze_lines()
+{
+	sed '/^$/N;/\n$/D'
+}
+
+#### Filter that converts non-breakable space U+00A0 to an ASCII space.
+prepare_space()
+{
+	sed 's/'"`printf '\\302\\240'`"'/ /g'
+}
+
+
+# first argument:	command line to run
+# second argument:	"normspace" to normalize the whitespace
+# stdin:		expected output
+runandcheck()
+{
+	if [ "$2" = "normspace" ]; then
+		eval "$1" 2>&1 | prepare_space >"$tmpfile"
+		diff="`prepare_space | diff -ub - "$tmpfile" || :`"
+	else
+		eval "$1" >"$tmpfile" 2>&1
+		diff="`diff -u - "$tmpfile"`"
+	fi
+
+	if [ "$diff" ]; then
+		echo "$0: $1 failed"
+		echo "$diff"
+		failed=`expr "${failed:-0}" + 1`
+	fi
 }