sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-selftest unconditionaly include subunit.sh

Browse Source 
we no longer . this file into other shell scripts, so we don't need
this check any more.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-03-28 22:05:27 +11:00
parent 53ddac3f27
commit 2839391c7d
12 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/script/tests/test_failure.sh
View File

@ -4,12 +4,8 @@
#
# Copyright (C) 2011 Michael Adam <obnox@samba.org>
# 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

2
source3/script/tests/test_local_s3.sh
View File

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

2
source3/script/tests/test_net_misc.sh
View File

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

2
source3/script/tests/test_net_registry.sh
View File

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

2
source3/script/tests/test_net_registry_roundtrip.sh
View File

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

2
source3/script/tests/test_ntlm_auth_s3.sh
View File

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

2
source3/script/tests/test_smbclient_auth.sh
View File

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

2
source3/script/tests/test_smbclient_s3.sh
View File

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

2
source3/script/tests/test_smbtorture_s3.sh
View File

@ -16,10 +16,8 @@ password="$4"
shift 4
ADDARGS="$*"
test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
incdir=`dirname $0`/../../../testprogs/blackbox
. $incdir/subunit.sh
}

8
source3/script/tests/test_success.sh
View File

@ -4,12 +4,8 @@
#
# Copyright (C) 2011 Michael Adam <obnox@samba.org>
# 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

2
source3/script/tests/test_testparm_s3.sh
View File

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

2
source3/script/tests/test_wbinfo_s3.sh
View File

@ -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`