diff options
| author | Günther Deschner <gd@samba.org> | 2010-08-13 18:28:48 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-08-13 18:30:37 +0200 |
| commit | 472d2a356fe2fad8b54920d99e2829344fd646cd (patch) | |
| tree | 459a6c9fd549c2904964eaeb5f51521bd538d32a | |
| parent | ca8db7fd63749989dcb3daae0c38b8b788ebdfb8 (diff) | |
| download | samba-472d2a356fe2fad8b54920d99e2829344fd646cd.tar.gz samba-472d2a356fe2fad8b54920d99e2829344fd646cd.tar.bz2 samba-472d2a356fe2fad8b54920d99e2829344fd646cd.zip | |
s3-selftest: fix testparm tests as non-root.
Thanks to Andreas for pointing this out.
Guenther
| -rwxr-xr-x | source3/script/tests/test_testparm_s3.sh | 2 | ||||
| -rwxr-xr-x | source3/selftest/tests.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh index c88fc2d9d5..b9e4b810cf 100755 --- a/source3/script/tests/test_testparm_s3.sh +++ b/source3/script/tests/test_testparm_s3.sh @@ -5,7 +5,7 @@ # The main purpose (for now) is to test all the special handlers # and the macro expansions. -TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp +TEMP_CONFFILE=${LOCAL_PATH}/smb.conf.tmp TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks" test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh index 7042ba2c43..7a9e68a243 100755 --- a/source3/selftest/tests.sh +++ b/source3/selftest/tests.sh @@ -81,6 +81,9 @@ export USERNAME PASSWORD="\$PASSWORD" export PASSWORD +LOCAL_PATH="\$LOCAL_PATH" +export LOCAL_PATH + ( shift $# testitprefix="local_s3." @@ -147,7 +150,7 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb #plantest "blackbox.smbclient_s3.crypt domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD "-e" plantest "blackbox.net_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_s3.sh -plantest "blackbox.testparm_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh +plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh ( shift $# |