From baa5c760e0ba1e1c014c92e1943938e2123205ac Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 23 Jan 2023 10:21:33 +0100 Subject: [PATCH 1/2] 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 Reviewed-by: Ralph Boehme (cherry picked from commit fd7187daed85f4ea51762c029ae8ef3fa893b2fb) --- source3/script/tests/test_chdir_cache.sh | 16 +++++++++++++--- source3/selftest/tests.py | 4 +++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/source3/script/tests/test_chdir_cache.sh b/source3/script/tests/test_chdir_cache.sh index c649d2b07b3..11967180d35 100755 --- 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-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 187f3ccd9c0..93fb4a97f89 100755 --- 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, -- 2.39.1 From 6dd4ca281009505a46365fa084fab842ce27bebc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 25 Jan 2023 17:26:17 +0100 Subject: [PATCH 2/2] selftest: Update devel_env.sh for SAMBA_DCERPCD_DONT_LOG_STDOUT=1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=15291 Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský (cherry picked from commit c7a3b256291dd7d18d67b7f909a00fbd2103e1b8) --- selftest/devel_env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/selftest/devel_env.sh b/selftest/devel_env.sh index d1c0736ab09..bbb99e0a250 100644 --- a/selftest/devel_env.sh +++ b/selftest/devel_env.sh @@ -9,3 +9,4 @@ export TDB_NO_FSYNC=1 export NMBD_DONT_LOG_STDOUT=1 export SMBD_DONT_LOG_STDOUT=1 export WINBINDD_DONT_LOG_STDOUT=1 +export SAMBA_DCERPCD_DONT_LOG_STDOUT=1 -- 2.39.1