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 ++------ source3/script/tests/test_local_s3.sh | 2 -- source3/script/tests/test_net_misc.sh | 2 -- source3/script/tests/test_net_registry.sh | 2 -- source3/script/tests/test_net_registry_roundtrip.sh | 2 -- source3/script/tests/test_ntlm_auth_s3.sh | 2 -- source3/script/tests/test_smbclient_auth.sh | 2 -- source3/script/tests/test_smbclient_s3.sh | 2 -- source3/script/tests/test_smbtorture_s3.sh | 2 -- source3/script/tests/test_success.sh | 8 ++------ source3/script/tests/test_testparm_s3.sh | 2 -- source3/script/tests/test_wbinfo_s3.sh | 2 -- 12 files changed, 4 insertions(+), 32 deletions(-) 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 diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh index de867c959e..d5a3d474ed 100755 --- a/source3/script/tests/test_local_s3.sh +++ b/source3/script/tests/test_local_s3.sh @@ -9,10 +9,8 @@ EOF exit 1; fi -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_net_misc.sh b/source3/script/tests/test_net_misc.sh index 015b5026a7..82775dc4d3 100755 --- a/source3/script/tests/test_net_misc.sh +++ b/source3/script/tests/test_net_misc.sh @@ -18,10 +18,8 @@ NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION" NETTIME="${NET} time" NETLOOKUP="${NET} lookup" -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index 21c452d6e1..b76a988b4d 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -27,10 +27,8 @@ else NETREG="${NET} registry" fi -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_net_registry_roundtrip.sh b/source3/script/tests/test_net_registry_roundtrip.sh index 5431098da0..ca56f6d126 100755 --- a/source3/script/tests/test_net_registry_roundtrip.sh +++ b/source3/script/tests/test_net_registry_roundtrip.sh @@ -25,10 +25,8 @@ else NETREG="${NET} registry" fi -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh index 4f84982503..99b2ab3f14 100755 --- a/source3/script/tests/test_ntlm_auth_s3.sh +++ b/source3/script/tests/test_ntlm_auth_s3.sh @@ -12,10 +12,8 @@ SRC3DIR=$2 shift 2 ADDARGS="$*" -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_smbclient_auth.sh b/source3/script/tests/test_smbclient_auth.sh index 7ee60b03c2..cb4aeb8072 100755 --- a/source3/script/tests/test_smbclient_auth.sh +++ b/source3/script/tests/test_smbclient_auth.sh @@ -17,10 +17,8 @@ SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient}" shift 4 ADDARGS="$*" -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index 857400e9b0..30b26a4d8c 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -21,10 +21,8 @@ WBINFO="$VALGRIND ${WBINFO:-$BINDIR/wbinfo}" shift 7 ADDARGS="$*" -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh index ca64fa283d..65c98a58ec 100755 --- a/source3/script/tests/test_smbtorture_s3.sh +++ b/source3/script/tests/test_smbtorture_s3.sh @@ -16,10 +16,8 @@ password="$4" shift 4 ADDARGS="$*" -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} diff --git a/source3/script/tests/test_success.sh b/source3/script/tests/test_success.sh index 09e7264536..fe63fb51a9 100755 --- a/source3/script/tests/test_success.sh +++ b/source3/script/tests/test_success.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 diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh index bced6e7e19..c9682f0dd1 100755 --- a/source3/script/tests/test_testparm_s3.sh +++ b/source3/script/tests/test_testparm_s3.sh @@ -17,10 +17,8 @@ LOCAL_PATH="$1" 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`/../../../testprogs/blackbox . $incdir/subunit.sh -} failed=0 diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh index 860e7c5afc..91a9f45b3a 100755 --- a/source3/script/tests/test_wbinfo_s3.sh +++ b/source3/script/tests/test_wbinfo_s3.sh @@ -9,10 +9,8 @@ fi ADDARGS="$*" -test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh -} testit "wbinfo" $VALGRIND $BINDIR/wbinfo $ADDARGS || failed=`expr $failed + 1` -- cgit