From a53caea7a27c8616cabfc2e5bdf91a90e35891d5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 14 Nov 2012 09:47:16 +0100
Subject: 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
---
 lib/subunit/shell/tests/test_function_output.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/subunit/shell')

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
-- 
cgit