summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2012-01-26 16:07:09 +1300
committerRobert Collins <robertc@robertcollins.net>2012-01-26 16:07:09 +1300
commit2fff53f50703aadf7856cb9aa54f6f0fe35e6483 (patch)
tree8d59bc405630406dfe863fd96b5667ba5792a071 /shell
parent00461beb4b64db6050cc38f70122c475394df057 (diff)
downloadsubunit-2fff53f50703aadf7856cb9aa54f6f0fe35e6483.tar.gz
Fix shell tests to handle timestamps (Paired with Stewart).
Diffstat (limited to 'shell')
-rwxr-xr-xshell/tests/test_function_output.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/shell/tests/test_function_output.sh b/shell/tests/test_function_output.sh
index b78eee6..00b0844 100755
--- a/shell/tests/test_function_output.sh
+++ b/shell/tests/test_function_output.sh
@@ -27,7 +27,7 @@
. ${SHELL_SHARE}subunit.sh
echo 'test: subunit_start_test output'
-func_output=$(subunit_start_test "foo bar")
+func_output=$(subunit_start_test "foo bar"|grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xtest: foo bar" ]; then
echo 'success: subunit_start_test output'
@@ -40,7 +40,7 @@ else
fi
subunit_start_test "subunit_pass_test output"
-func_output=$(subunit_pass_test "foo bar")
+func_output=$(subunit_pass_test "foo bar"|grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xsuccess: foo bar" ]; then
subunit_pass_test "subunit_pass_test output"
@@ -53,12 +53,12 @@ else
fi
subunit_start_test "subunit_fail_test output"
-func_output=$(subunit_fail_test "foo bar" <<END
+func_output=$((subunit_fail_test "foo bar" <<END
something
wrong
here
END
-)
+)|grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xfailure: foo bar [
something
@@ -75,12 +75,12 @@ else
fi
subunit_start_test "subunit_error_test output"
-func_output=$(subunit_error_test "foo bar" <<END
+func_output=$((subunit_error_test "foo bar" <<END
something
died
here
END
-)
+)| grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xerror: foo bar [
something