s3:tests: Add support for SMBD_DONT_LOG_STDOUT=1 in test_chdir_cache.sh

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15291

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/script/tests/test_chdir_cache.sh b/source3/script/tests/test_chdir_cache.sh
index c649d2b07b3fb278401300b04e3645eab3596c30..11967180d35f3d1b0ce7f629cdad4010b1acffc4 100755 (executable)
--- a/source3/script/tests/test_chdir_cache.sh
+++ b/source3/script/tests/test_chdir_cache.sh
@@ -9,7 +9,7 @@
 
 if [ $# -lt 5 ]; then
        echo Usage: test_chdir_user.sh \
-               --configfile=SERVERCONFFILE SMBCLIENT SMBCONTROL SERVER SHARE
+               --configfile=SERVERCONFFILE SMBCLIENT SMBCONTROL SERVER SHARE PREFIX TESTENV
        exit 1
 fi
 
@@ -23,6 +23,12 @@ SERVER=$1
 shift 1
 SHARE=$1
 shift 1
+PREFIX=${1}
+shift 1
+TESTENV=${1}
+shift 1
+
+PREFIX_ABS="$(readlink -f "${PREFIX}")"
 
 # Do not let deprecated option warnings muck this up
 SAMBA_DEPRECATED_SUPPRESS=1
@@ -30,8 +36,6 @@ export SAMBA_DEPRECATED_SUPPRESS
 
 conf_dir=$(dirname ${SERVERCONFFILE})
 
-log_file=${conf_dir}/../smbd_test.log
-
 error_inject_conf=${conf_dir}/error_inject.conf
 rm -f ${error_inject_conf}
 
@@ -52,6 +56,12 @@ ${SMBCLIENT} //${SERVER}/${SHARE} ${CONF} -U${USER}%${PASSWORD} \
        <smbclient-stdin >smbclient-stdout 2>smbclient-stderr &
 CLIENT_PID=$!
 
+log_file="${PREFIX_ABS}/${TESTENV}/smbd_test.log"
+# Add support for "SMBD_DONT_LOG_STDOUT=1"
+if [ -r "${PREFIX_ABS}/${TESTENV}/logs/log.smbd" ]; then
+       log_file="${PREFIX_ABS}/${TESTENV}/logs/log.smbd"
+fi
+
 # Count the number of chdir_current_service: vfs_ChDir.*failed: Permission denied
 # errors that are already in the log (should be zero).
 num_errs=$(grep "chdir_current_service: vfs_ChDir.*failed: Permission denied" ${log_file} | wc -l)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 187f3ccd9c00e1f8c77fb77d204a78ca5851182a..93fb4a97f895e8734acf00c4897da22928a81520 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1402,7 +1402,9 @@ plantestsuite("samba3.blackbox.chdir-cache", "simpleserver:local",
                os.path.join(bindir(), "smbclient"),
                os.path.join(bindir(), "smbcontrol"),
                '$SERVER_IP',
-               "error_inject"])
+               "error_inject",
+               '$PREFIX',
+               'simpleserver'])
 
 plantestsuite("samba3.blackbox.netfileenum", "simpleserver:local",
               [os.path.join(samba3srcdir,