summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-02-19 00:32:06 +0100
committerMichael Adam <obnox@samba.org>2011-02-19 12:23:24 +0100
commitae9aa47d6bcfa4ececdc1c74695c4c9a6c045ab6 (patch)
treeb96d49d1c9a7165fa6104552ac2722396ec325f7
parenta1bec01eeb660e8ff00d77da185f81815be94c30 (diff)
downloadsamba-ae9aa47d6bcfa4ececdc1c74695c4c9a6c045ab6.tar.gz
samba-ae9aa47d6bcfa4ececdc1c74695c4c9a6c045ab6.tar.bz2
samba-ae9aa47d6bcfa4ececdc1c74695c4c9a6c045ab6.zip
s3:tests: use the blackbox subunit output formatter for the testparm_s3 test.
With the old output, failures would go unnoticed by selftest.
-rwxr-xr-xsource3/script/tests/test_testparm_s3.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
index b9e4b810cf..0fd1a57c2b 100755
--- a/source3/script/tests/test_testparm_s3.sh
+++ b/source3/script/tests/test_testparm_s3.sh
@@ -9,8 +9,8 @@ TEMP_CONFFILE=${LOCAL_PATH}/smb.conf.tmp
TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks"
test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
-incdir=`dirname $0`
-. $incdir/test_functions.sh
+incdir=`dirname $0`/../../../testprogs/blackbox
+. $incdir/subunit.sh
}
failed=0