From 56c28d1cfb06688f77a87fb2af0609c72db829bc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 21 Feb 2011 09:10:33 +1100
Subject: s3-tests use $PREFIX to ensure tests don't work outside the test area

Andrew Bartlett
---
 source3/script/tests/test_smbclient_s3.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source3/script/tests/test_smbclient_s3.sh')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 075c6c548d..1335a37cef 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -2,9 +2,9 @@
 
 # this runs the file serving tests that are expected to pass with samba3
 
-if [ $# -lt 6 ]; then
+if [ $# -lt 7 ]; then
 cat <<EOF
-Usage: test_smbclient_s3.sh SERVER SERVER_IP USERNAME PASSWORD USERID LOCAL_PATH
+Usage: test_smbclient_s3.sh SERVER SERVER_IP USERNAME PASSWORD USERID LOCAL_PATH PREFIX
 EOF
 exit 1;
 fi
@@ -15,9 +15,10 @@ USERNAME="$3"
 PASSWORD="$4"
 USERID="$5"
 LOCAL_PATH="$6"
+PREFIX="$7"
 SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
 WBINFO="$VALGRIND ${WBINFO:-$BINDIR/wbinfo}"
-shift 6
+shift 7
 ADDARGS="$*"
 
 test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
@@ -58,7 +59,7 @@ test_noninteractive_no_prompt()
 test_interactive_prompt_stdout()
 {
     prompt="smb"
-    tmpfile=/tmp/smbclient.in.$$
+    tmpfile=$PREFIX/smbclient_interactive_prompt_commands
 
     cat > $tmpfile <<EOF
 du
@@ -93,7 +94,7 @@ EOF
 test_bad_symlink()
 {
     prompt="posix_unlink deleted file /newname"
-    tmpfile=/tmp/smbclient.in.$$
+    tmpfile=$PREFIX/smbclient_bad_symlinks_commands
 
     cat > $tmpfile <<EOF
 posix
-- 
cgit