diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-11-14 09:47:16 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-11-14 12:11:57 +0100 |
| commit | a53caea7a27c8616cabfc2e5bdf91a90e35891d5 (patch) | |
| tree | 5e1ad6e0387c076cc41d14213efbe4457d861690 /lib/subunit/shell | |
| parent | 7b654a8c180a6467147189332916a5e56634b5af (diff) | |
| download | samba-a53caea7a27c8616cabfc2e5bdf91a90e35891d5.tar.gz samba-a53caea7a27c8616cabfc2e5bdf91a90e35891d5.tar.bz2 samba-a53caea7a27c8616cabfc2e5bdf91a90e35891d5.zip | |
subunit: Update to latest upstream version.
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Wed Nov 14 12:11:58 CET 2012 on sn-devel-104
Diffstat (limited to 'lib/subunit/shell')
| -rwxr-xr-x | lib/subunit/shell/tests/test_function_output.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/subunit/shell/tests/test_function_output.sh b/lib/subunit/shell/tests/test_function_output.sh index b78eee6946..00b0844dda 100755 --- a/lib/subunit/shell/tests/test_function_output.sh +++ b/lib/subunit/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 |