X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=t%2Ftest-lib.sh;h=0e702b53c9b4c4150418dc0e2a07e55949817b04;hp=e444e5780d2f152eb9755916375996c9340016cd;hb=ee3dfa7ab8a74124448649386e877775cd8625b6;hpb=c7250fb279af132333266af36e19c156dd84eca1

diff --git a/t/test-lib.sh b/t/test-lib.sh
index e444e578..0e702b53 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -21,22 +21,22 @@ say_color()
 	if [[ "$o_nocolor" != "true" && -n "$1" ]]; then
 		export TERM=$ORIGINAL_TERM
 		case "$1" in
-			error) tput bold; tput setaf 1;;
-			skip)  tput setaf 5;;
+			error) tput $C_BOLD; tput $C_SETAF 1;;
+			skip)  tput $C_SETAF 5;;
 			ok)
 				(($o_verbose == 0)) && return
-				tput setaf 2;;
-			pass)  tput bold; tput setaf 2;;
-			info)  tput setaf 3;;
+				tput $C_SETAF 2;;
+			pass)  tput $C_BOLD; tput $C_SETAF 2;;
+			info)  tput $C_SETAF 3;;
 			run)
 				(($o_verbose == 0)) && return
-				tput setaf 6;;
+				tput $C_SETAF 6;;
 		esac
 	fi
 	shift
 	printf "%s\n" "$*"
 	if [[ "$o_nocolor" != "true" && -n "$1" ]]; then
-		tput sgr0
+		tput $C_SGR0
 		export TERM=dumb
 	fi
 }
@@ -61,13 +61,36 @@ say()
 	say_color info "$*"
 }
 
+retval_ok()
+{
+	local rv="$1" expectation="$2"
+
+	if [[ "$expectation" == "success" ]]; then
+		(($rv == 0)) && return 0 || return 1
+	fi
+	if (($rv > 129 && $rv <= 192)); then
+		echo >&2 "died by signal"
+		return 1
+	fi
+	if (($rv == 127)); then
+                echo >&2 "command not found"
+		return 1
+	fi
+	if (($rv == 0)); then
+                echo >&2 "command was supposed to fail but succeeded"
+		return 1
+	fi
+	return 0
+}
+
 _test_run()
 {
-	local f
+	local f expectation="$3" ret
 
 	let test_count++
 	eval >&3 2>&4 "$2"
-	if (($? == 0)); then
+	ret=$?
+	if retval_ok "$ret" "$expectation"; then
 		let test_success++
 		say_color ok "ok $test_count - $1"
 		return
@@ -139,8 +162,16 @@ test_duration()
 test_expect_success()
 {
 	(($# != 2)) && error "bug: not 2 parameters to test_expect_success()"
-	say >&3 "expecting success: $2"
-	_test_run "$1" "$2"
+	echo >&3 "expecting success: $2"
+	_test_run "$1" "$2" "success"
+	echo >&3 ""
+}
+
+test_expect_failure()
+{
+	(($# != 2)) && error "bug: not 2 parameters to test_expect_failure()"
+	echo >&3 "expecting failure: $2"
+	_test_run "$1" "$2" "failure"
 	echo >&3 ""
 }
 
@@ -187,9 +218,21 @@ can_use_colors()
 	result="false"
 	[[ "$TERM" == "dumb" ]] && return
 	[[ -t 1 ]] || return
-	tput bold >/dev/null 2>&1 || return
-	tput setaf 1 >/dev/null 2>&1 || return
-	tput sgr0 >/dev/null 2>&1 || return
+	C_BOLD='bold'
+	tput $C_BOLD &>/dev/null || {
+		C_BOLD='md'
+		tput $C_BOLD &>/dev/null
+	} || return
+	C_SETAF='setaf'
+	tput $C_SETAF 1 &>/dev/null || {
+		C_SETAF='AF'
+		tput $C_SETAF 1 &>/dev/null
+	} || return
+	C_SGR0='sgr0'
+	tput $C_SGR0 >/dev/null 2>&1 || {
+		C_SGR0='me'
+		tput $C_SGR0 &>/dev/null
+	} || return
 	result="true"
 }
 
@@ -204,6 +247,7 @@ parse_options()
 		-v=1|--verbose=1) o_verbose="1"; shift;;
 		-v|--verbose|-v=2|--verbose=2) o_verbose="2"; shift;;
 		--no-color) o_nocolor="true"; shift;;
+		--man-dir) export o_man_dir="$2"; shift; shift;;
 		--results-dir) o_results_dir="$2"; shift; shift;;
 		--trash-dir) o_trash_dir="$2"; shift; shift;;
 		--executables-dir) export o_executables_dir="$2"; shift; shift;;
@@ -234,11 +278,13 @@ fixup_dirs()
 	[[ -z "$o_results_dir" ]] && o_results_dir="$test_dir/test-results"
 	[[ -z "$o_executables_dir" ]] && o_executables_dir="$test_dir/.."
 	[[ -z "$o_trash_dir" ]] && o_trash_dir="$test_dir/trashes"
+	[[ -z "$o_man_dir" ]] && o_man_dir="$test_dir/../build/man/man1"
 
 	# we want alsolute paths because relative paths become invalid
 	# after changing to the trash dir
 	[[ -n "${o_results_dir##/*}" ]] && o_results_dir="$wd/$o_results_dir"
 	[[ -n "${o_executables_dir##/*}" ]] && o_executables_dir="$wd/$o_results_dir"
+	[[ -n "${o_man_dir##/*}" ]] && o_man_dir="$wd/$o_man_dir"
 	[[ -n "${o_trash_dir##/*}" ]] && o_trash_dir="$wd/$o_trash_dir"
 
 	mkdir -p "$o_results_dir"