From: Michael Adam <obnox@samba.org>
Date: Sat, 19 Feb 2011 00:14:54 +0000 (+0100)
Subject: s3:tests: include subunit.sh instead of test_functions.sh in test_wbinfo_s3.sh
X-Git-Tag: tevent-0.9.11~488
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4eb3da2b0ece1c4d33c679c39f2beff0f2a324da;p=thirdparty%2Fsamba.git

s3:tests: include subunit.sh instead of test_functions.sh in test_wbinfo_s3.sh

It would actually not be necessary at all to include a script providing
testit() and so on, since this script snippet is currently only sourced
in tests.sh to plan the included test.
---

diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index d501311b14f..a63bcba794a 100755
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -15,8 +15,8 @@ shift 4
 ADDARGS="$*"
 
 test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
-incdir=`dirname $0`
-. $incdir/test_functions.sh
+incdir=`dirname $0`/../../../testprogs/blackbox
+. $incdir/subunit.sh
 }
 
 OLDIFS=$IFS;