if [ -n "$BASH_VERSION" ]; then
- _wvfind_caller()
- {
- WVCALLER_FILE=${BASH_SOURCE[2]}
- WVCALLER_LINE=${BASH_LINENO[1]}
- }
+ . ./wvtest-bash.sh # This keeps sh from choking on the syntax.
else
+ _wvbacktrace() { true; }
+ _wvpushcall() { true; }
+ _wvpopcall() { true; }
+
_wvfind_caller()
{
WVCALLER_FILE="unknown"
_wvcheck()
{
- CODE="$1"
- TEXT=$(_wvtextclean "$2")
- OK=ok
+ local CODE="$1"
+ local TEXT=$(_wvtextclean "$2")
+ local OK=ok
if [ "$CODE" -ne 0 ]; then
OK=FAILED
fi
echo "! $WVCALLER_FILE:$WVCALLER_LINE $TEXT $OK" >&2
if [ "$CODE" -ne 0 ]; then
+ _wvbacktrace
exit $CODE
else
return 0
WVPASS()
{
- TEXT="$*"
+ local TEXT="$*"
+ _wvpushcall "$@"
_wvfind_caller
if "$@"; then
+ _wvpopcall
_wvcheck 0 "$TEXT"
return 0
else
WVFAIL()
{
- TEXT="$*"
+ local TEXT="$*"
+ _wvpushcall "$@"
_wvfind_caller
if "$@"; then
return 1
else
_wvcheck 0 "NOT($TEXT)"
+ _wvpopcall
return 0
fi
}
WVPASSEQ()
{
+ _wvpushcall "$@"
_wvfind_caller
_wvcheck $(_wvgetrv [ "$#" -eq 2 ]) "exactly 2 arguments"
echo "Comparing:" >&2
echo "--" >&2
echo "$2" >&2
_wvcheck $(_wvgetrv [ "$1" = "$2" ]) "'$1' = '$2'"
+ _wvpopcall
}
WVPASSNE()
{
+ _wvpushcall "$@"
_wvfind_caller
_wvcheck $(_wvgetrv [ "$#" -eq 2 ]) "exactly 2 arguments"
echo "Comparing:" >&2
echo "--" >&2
echo "$2" >&2
_wvcheck $(_wvgetrv [ "$1" != "$2" ]) "'$1' != '$2'"
+ _wvpopcall
}
WVPASSRC()
{
- RC=$?
+ local RC=$?
+ _wvpushcall "$@"
_wvfind_caller
_wvcheck $(_wvgetrv [ $RC -eq 0 ]) "return code($RC) == 0"
+ _wvpopcall
}
WVFAILRC()
{
- RC=$?
+ local RC=$?
+ _wvpushcall "$@"
_wvfind_caller
_wvcheck $(_wvgetrv [ $RC -ne 0 ]) "return code($RC) != 0"
+ _wvpopcall
}
_wvfind_caller
echo "Testing \"$*\" in $WVCALLER_FILE:" >&2
}
+
+
+WVDIE()
+{
+ local TEXT=$(_wvtextclean "$@")
+ _wvpushcall "$@"
+ _wvfind_caller
+ echo "! $WVCALLER_FILE:$WVCALLER_LINE $TEXT FAILED" 1>&2
+ exit 1
+}
+
+
+# Local Variables:
+# indent-tabs-mode: t
+# sh-basic-offset: 8
+# End: