diff --git a/NEWS b/NEWS index 2f36c3f..14f7303 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ IMPROVEMENTS * Perl module now correctly outputs "failure" instead of "fail". (Stewart Smith) -* Shell functions now output timestamps. (Stewart Smith) +* Shell functions now output timestamps. (Stewart Smith, Robert Collins) BUG FIXES ~~~~~~~~~ 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" <