s3:script:tests: create temporary files under $PREFIX/SELFTEST_TMPDIR

Tests should not create files in the build nor the source directory!
They should cope with read only access to them.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/script/tests/test_aio_outstanding.sh b/source3/script/tests/test_aio_outstanding.sh
index b189343bb248fe5f31575d3f96328fa3045dcdbd..f4265277a1a407f3ddec118371624d8391c8422e 100755 (executable)
--- a/source3/script/tests/test_aio_outstanding.sh
+++ b/source3/script/tests/test_aio_outstanding.sh
@@ -22,6 +22,9 @@ incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
 failed=0
+
+cd $SELFTEST_TMPDIR || exit 1
+
 #
 # Note if we already have any panics in the smbd log.
 #

diff --git a/source3/script/tests/test_close_denied_share.sh b/source3/script/tests/test_close_denied_share.sh
index bcd3883a064894c689976ea6cc90157328e2ebed..58850e754e369f445e121d381b41ea4218e32823 100755 (executable)
--- a/source3/script/tests/test_close_denied_share.sh
+++ b/source3/script/tests/test_close_denied_share.sh
@@ -22,6 +22,8 @@ incdir=$(dirname $0)/../../../testprogs/blackbox
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 rm -f smbclient-stdin smbclient-stdout
 mkfifo smbclient-stdin smbclient-stdout
 

diff --git a/source3/script/tests/test_durable_handle_reconnect.sh b/source3/script/tests/test_durable_handle_reconnect.sh
index 2f6b308eebe98513b26e2aa477b83fb3f235accc..c75c6124ef1fb5e7745187b601fc8acb29bb460d 100755 (executable)
--- a/source3/script/tests/test_durable_handle_reconnect.sh
+++ b/source3/script/tests/test_durable_handle_reconnect.sh
@@ -7,6 +7,8 @@
 . $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 delay_inject_conf=$(dirname $SMB_CONF_PATH)/delay_inject.conf
 
 echo 'delay_inject:ntimes = 5000' > $delay_inject_conf

diff --git a/source3/script/tests/test_forceuser_validusers.sh b/source3/script/tests/test_forceuser_validusers.sh
index 4b6d66e9fa2d529fa2d77e1104d82ee02b3adfa1..d9150c95a675f09e95d4acc359b83ff4d75aad1c 100755 (executable)
--- a/source3/script/tests/test_forceuser_validusers.sh
+++ b/source3/script/tests/test_forceuser_validusers.sh
@@ -25,6 +25,7 @@ failed=0
 incdir=`dirname $0`/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
+cd $SELFTEST_TMPDIR || exit 1
 
 run_cmd_nooutput() {
        CMD="$1"

diff --git a/source3/script/tests/test_large_acl.sh b/source3/script/tests/test_large_acl.sh
index 9b6901fcfb1193f69d8c02a4d6f96bdfcf553353..d18c098b512e0720f0887917f4e4a2db03d4239f 100755 (executable)
--- a/source3/script/tests/test_large_acl.sh
+++ b/source3/script/tests/test_large_acl.sh
@@ -23,6 +23,8 @@ SMBCACLS="$VALGRIND ${SMBCACLS} ${ADDARGS}"
 incdir=`dirname $0`/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
+cd $SELFTEST_TMPDIR || exit 1
+
 # build a file to work with
 build_files()
 {

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index d92e328d03011c9966efdc33448c36b1f9aed57d..0b71a8d284dcd9265a403fd5d15b47943d1ba41d 100755 (executable)
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -14,8 +14,9 @@ incdir=`dirname $0`/../../../testprogs/blackbox
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
 
-if test -x bin/talloctort ; then
+if test -x $BINDIR/talloctort ; then
        testit "talloctort" $VALGRIND $BINDIR/talloctort || \
                failed=`expr $failed + 1`
 else
@@ -25,7 +26,7 @@ fi
 testit "replace_testsuite" $VALGRIND $BINDIR/replace_testsuite || \
     failed=`expr $failed + 1`
 
-if test -x bin/tdbtorture ; then
+if test -x $BINDIR/tdbtorture ; then
        testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
                failed=`expr $failed + 1`
 else

diff --git a/source3/script/tests/test_netfileenum.sh b/source3/script/tests/test_netfileenum.sh
index e917ad4286293ce1a5a4af365efae0591410be4f..e8c464307b80c194867ed449c487aae8dc49205d 100755 (executable)
--- a/source3/script/tests/test_netfileenum.sh
+++ b/source3/script/tests/test_netfileenum.sh
@@ -21,6 +21,8 @@ incdir=$(dirname $0)/../../../testprogs/blackbox
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 rm -f smbclient-stdin smbclient-stdout smbclient-stderr
 mkfifo smbclient-stdin smbclient-stdout smbclient-stderr
 

diff --git a/source3/script/tests/test_open_eintr.sh b/source3/script/tests/test_open_eintr.sh
index 437934d1cd7c1da65a876a88516bee131591b617..3eabb2a4bc765549465dddaeb21b5db91ca3b34b 100755 (executable)
--- a/source3/script/tests/test_open_eintr.sh
+++ b/source3/script/tests/test_open_eintr.sh
@@ -24,6 +24,8 @@ incdir=$(dirname $0)/../../../testprogs/blackbox
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 rm -f smbclient-stdin smbclient-stdout smbclient-stderr
 mkfifo smbclient-stdin smbclient-stdout smbclient-stderr
 

diff --git a/source3/script/tests/test_preserve_case.sh b/source3/script/tests/test_preserve_case.sh
index 04885f12a1e68836c747fe50250d4ab39e57c6b2..28da484b52d3fc752d9444171533aa1e2e1ff25a 100755 (executable)
--- a/source3/script/tests/test_preserve_case.sh
+++ b/source3/script/tests/test_preserve_case.sh
@@ -29,6 +29,8 @@ failed=0
 incdir=`dirname $0`/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
+cd $SELFTEST_TMPDIR || exit 1
+
 test_smbclient() {
        name="$1"
        share="$2"

diff --git a/source3/script/tests/test_registry_upgrade.sh b/source3/script/tests/test_registry_upgrade.sh
index cf14141818dee54b0bb02e98b3afda60d21eba6b..066adf883ecf59e7305328227e236209604cd8e4 100755 (executable)
--- a/source3/script/tests/test_registry_upgrade.sh
+++ b/source3/script/tests/test_registry_upgrade.sh
@@ -15,7 +15,7 @@ BASE_DIR="${SCRIPT_DIR}/../../.."
 NET="$1"
 DBWRAP_TOOL="$2 --persistent"
 DATADIR="${BASE_DIR}/testdata/samba3"
-WORKSPACE="${PREFIX}/registry_upgrade"
+WORKSPACE="${SELFTEST_TMPDIR}/registry_upgrade"
 CONFIG_FILE="${WORKSPACE}/smb.conf"
 CONFIGURATION="--configfile=${CONFIG_FILE}"
 
@@ -26,6 +26,8 @@ incdir="${BASE_DIR}/testprogs/blackbox"
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 REGPATH="HKLM\Software\Samba"
 
 LOGDIR_PREFIX="registry_upgrade"
@@ -77,7 +79,7 @@ registry_upgrade()
 {
     echo registry_upgrade $1 | tee -a $LOG
 
-    cp -v $DATADIR/registry.tdb $WORKSPACE/registry.tdb >> $LOG 2>&1
+    (cat $DATADIR/registry.tdb > $WORKSPACE/registry.tdb) >> $LOG 2>&1
 
     REGISTRY="${WORKSPACE}/registry.tdb"
 
@@ -173,24 +175,18 @@ registry_upgrade()
     }
 }
 
-# remove old logs
-for OLDDIR in $(find ${PREFIX} -type d -name "${LOGDIR_PREFIX}_*") ; do
-       echo "removing old directory ${OLDDIR}"
-       rm -rf ${OLDDIR}
-done
-
 # remove old workspace
 rm -rf $WORKSPACE
 
 mkdir $WORKSPACE
 
-DIR=$(mktemp -d ${PREFIX}/${LOGDIR_PREFIX}_XXXXXX)
+DIR=$(mktemp -d ${WORKSPACE}/${LOGDIR_PREFIX}_XXXXXX)
 LOG=$DIR/log
 
 testit "registry_upgrade" registry_upgrade || failed=`expr $failed + 1`
 
 if [ $failed -eq 0 ]; then
-    rm -r $DIR
+    rm -rf $WORKSPACE
 fi
 
 testok $0 $failed

diff --git a/source3/script/tests/test_shadow_copy_torture.sh b/source3/script/tests/test_shadow_copy_torture.sh
index 240a008350603eea83689ae114f4c7f301f9e2d7..ce10bae3670563143d36da3dac96107e81457ba2 100755 (executable)
--- a/source3/script/tests/test_shadow_copy_torture.sh
+++ b/source3/script/tests/test_shadow_copy_torture.sh
@@ -26,6 +26,8 @@ SNAPSHOT="@GMT-2015.10.31-19.40.30"
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 # build a hierarchy of files, symlinks, and directories
 build_files()
 {

diff --git a/source3/script/tests/test_smb1_shadow_copy_torture.sh b/source3/script/tests/test_smb1_shadow_copy_torture.sh
index cae9c023f82f76cf9ba8a1810b5be8cf7e066100..3cda7ac15af84ff3393e9c1be1482dee9a7250f3 100755 (executable)
--- a/source3/script/tests/test_smb1_shadow_copy_torture.sh
+++ b/source3/script/tests/test_smb1_shadow_copy_torture.sh
@@ -26,6 +26,8 @@ SNAPSHOT="@GMT-2015.10.31-19.40.30"
 
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 # build a hierarchy of files, symlinks, and directories
 build_files()
 {

diff --git a/source3/script/tests/test_smbclient_mget.sh b/source3/script/tests/test_smbclient_mget.sh
index 45f62f15d4d41f50356fb487c6b799e79dc6903c..a1ac59b8de6f9d79b059b1f9415e20a3d4e8aad7 100755 (executable)
--- a/source3/script/tests/test_smbclient_mget.sh
+++ b/source3/script/tests/test_smbclient_mget.sh
@@ -19,6 +19,8 @@ USERNAME="$1"; shift
 PASSWORD="$1"; shift
 DIRECTORY="$1"; shift
 
+cd $SELFTEST_TMPDIR || exit 1
+
 # Can't use "testit" here -- it somehow breaks the -c command passed
 # to smbclient into two, spoiling the "mget"
 

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 7f801decb391702ef2092acab013d9df7fde00e7..a9d59095bd31cd8a6f4c85492d08002bd4c9487e 100755 (executable)
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -1105,16 +1105,17 @@ test_nosymlinks()
     rm -rf $local_test_dir
 
     local_nosymlink_target_file="nosymlink_target_file"
-    echo "$local_slink_target" > $local_nosymlink_target_file
+    echo "$local_slink_target" > $PREFIX/$local_nosymlink_target_file
 
     local_foobar_target_file="testfile"
-    echo "$share_target_file" > $local_foobar_target_file
+    echo "$share_target_file" > $PREFIX/$local_foobar_target_file
 
     tmpfile=$PREFIX/smbclient_interactive_prompt_commands
     cat > $tmpfile <<EOF
 mkdir $share_test_dir
 mkdir $share_foo_dir
 mkdir $share_foobar_dir
+lcd $PREFIX
 cd /$share_test_dir
 put $local_nosymlink_target_file
 cd /$share_foobar_dir
@@ -1127,8 +1128,8 @@ EOF
     out=`eval $cmd`
     ret=$?
     rm -f $tmpfile
-    rm -f $local_nosymlink_target_file
-    rm -f $local_foobar_target_file
+    rm -f $PREFIX/$local_nosymlink_target_file
+    rm -f $PREFIX/$local_foobar_target_file
 
     if [ $ret -ne 0 ] ; then
        echo "$out"

diff --git a/source3/script/tests/test_smbget.sh b/source3/script/tests/test_smbget.sh
index b0ff75f5eb5b6c139f030d44bd62b0b36ec5396d..bcd2a463dc6d0db3429baf06c8d7f7165a9f545a 100755 (executable)
--- a/source3/script/tests/test_smbget.sh
+++ b/source3/script/tests/test_smbget.sh
@@ -18,7 +18,7 @@ PASSWORD=${5}
 WORKDIR=${6}
 SMBGET="$VALGRIND ${7}"
 
-TMPDIR="$SRCDIR_ABS/st/tmp"
+TMPDIR="$SELFTEST_TMPDIR"
 
 incdir=`dirname $0`/../../../testprogs/blackbox
 . $incdir/subunit.sh

diff --git a/source3/script/tests/test_zero_data.sh b/source3/script/tests/test_zero_data.sh
index 6b965b57ba593d79aea5013b959bcd59b8d106b7..147a7da549997d2944e482bc6c6cb89d719b4078 100755 (executable)
--- a/source3/script/tests/test_zero_data.sh
+++ b/source3/script/tests/test_zero_data.sh
@@ -19,6 +19,8 @@ LOCAL_PATH=${4}
 . $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 failed=0
 
+cd $SELFTEST_TMPDIR || exit 1
+
 TESTDIR=$LOCAL_PATH/zero_data
 
 mkdir -p $TESTDIR