summaryrefslogtreecommitdiff
path: root/source3/script/tests/test_smbclient_s3.sh
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-11 08:16:50 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-12 20:42:22 +1000
commit28ad50e5fd1887fff149d05793b2dabe5a08051a (patch)
tree33fe1c6cac33bfa414052ca80e1a77e78b47c8ca /source3/script/tests/test_smbclient_s3.sh
parente223a65b1011f82687e2fdfa102f305e1fd76214 (diff)
downloadsamba-28ad50e5fd1887fff149d05793b2dabe5a08051a.tar.gz
samba-28ad50e5fd1887fff149d05793b2dabe5a08051a.tar.bz2
samba-28ad50e5fd1887fff149d05793b2dabe5a08051a.zip
s3-selftest: Set path to bin/net and bin/wbinfo in command line to test scripts
This makes it easier to reproduce these tests outside the test environment, as we rely less on environment variables. Andrew Bartlett
Diffstat (limited to 'source3/script/tests/test_smbclient_s3.sh')
-rwxr-xr-xsource3/script/tests/test_smbclient_s3.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 05bc8ef4e9..d2c504908b 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -4,7 +4,7 @@
if [ $# -lt 7 ]; then
cat <<EOF
-Usage: test_smbclient_s3.sh SERVER SERVER_IP DOMAIN USERNAME PASSWORD USERID LOCAL_PATH PREFIX SMBCLIENT
+Usage: test_smbclient_s3.sh SERVER SERVER_IP DOMAIN USERNAME PASSWORD USERID LOCAL_PATH PREFIX SMBCLIENT WBINFO
EOF
exit 1;
fi
@@ -18,9 +18,10 @@ USERID="$6"
LOCAL_PATH="$7"
PREFIX="$8"
SMBCLIENT="$9"
+WBINFO="$10"
SMBCLIENT="$VALGRIND ${SMBCLIENT}"
-WBINFO="$VALGRIND ${WBINFO:-$BINDIR/wbinfo}"
-shift 9
+WBINFO="$VALGRIND ${WBINFO}"
+shift 10
ADDARGS="$*"
incdir=`dirname $0`/../../../testprogs/blackbox