From 2839391c7deac3436046807e4238bb9e5802530b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 28 Mar 2011 22:05:27 +1100 Subject: s3-selftest unconditionaly include subunit.sh we no longer . this file into other shell scripts, so we don't need this check any more. Andrew Bartlett --- source3/script/tests/test_failure.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source3/script/tests/test_failure.sh') diff --git a/source3/script/tests/test_failure.sh b/source3/script/tests/test_failure.sh index 8af0f3afff..4980fb0920 100755 --- a/source3/script/tests/test_failure.sh +++ b/source3/script/tests/test_failure.sh @@ -4,12 +4,8 @@ # # Copyright (C) 2011 Michael Adam -# include the blackbox subunit infrastructure -# if not run from classical s3 test script: -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { - incdir=`dirname $0`/../../../testprogs/blackbox - . $incdir/subunit.sh -} +incdir=`dirname $0`/../../../testprogs/blackbox +. $incdir/subunit.sh failed=0 -- cgit