summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-01-26 15:38:19 -0800
committerTim Prouty <tprouty@samba.org>2009-01-26 15:38:19 -0800
commit7f12eb97611a90e5bc01009d23b419f3669e9e7a (patch)
tree2367964af252a44566e97184a22367cb01c83a6d
parent3aeee79096e7a3c4f1467228d5cbee6986866400 (diff)
downloadsamba-7f12eb97611a90e5bc01009d23b419f3669e9e7a.tar.gz
samba-7f12eb97611a90e5bc01009d23b419f3669e9e7a.tar.bz2
samba-7f12eb97611a90e5bc01009d23b419f3669e9e7a.zip
s3 make test: Fix a bug in the previous commit
Luckily the build farm caught this
-rwxr-xr-xsource3/script/tests/selftest.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index ea2260d32d..0f1ca32e4a 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -25,11 +25,11 @@ do
done
echo "Running selftest with the following"
-echo "Selftest Directory:\t\t$DIRECTORY"
-echo "Subtests to Run:\t\t$SUBTESTS"
-echo "smbtorture4 Path:\t\t$SMBTORTURE4"
-echo "Alternative Share Dir:\t\t$ALT_SHRDIR_ARG"
-echo "Custom Configuration:\t\t$CUSTOM_CONF_ARG"
+echo "Selftest Directory: $DIRECTORY"
+echo "Subtests to Run: $SUBTESTS"
+echo "smbtorture4 Path: $SMBTORTURE4"
+echo "Alternative Share Dir: $ALT_SHRDIR_ARG"
+echo "Custom Configuration: $CUSTOM_CONF_ARG"
if [ $CUSTOM_CONF_ARG ]; then
INCLUDE_CUSTOM_CONF="include = $CUSTOM_CONF_ARG"
@@ -95,11 +95,12 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
PATH=bin:$PATH
export PATH
-if [ $SMBTORTRE4 ]; then
+if [ $SMBTORTURE4 ]; then
SAMBA4BINDIR=`dirname $SMBTORTURE4`
- SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared"
fi
+SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared"
+
export SAMBA4SHAREDDIR
export SMBTORTURE4