[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2639-g784e9e6
Michael Adam
obnox at samba.org
Mon Jun 23 12:02:45 GMT 2008
The branch, v3-2-test has been updated
via 784e9e6b9ce4cc043bdeba8ca396f59de51cd294 (commit)
via eff6a48cee0fa6a320728f3bb44c3894dd3f6044 (commit)
via febf046fc47dd3de3bbb6c0da5b218d73ef0487c (commit)
via b517b0c0f20127876c63cc726afe7f902421af15 (commit)
via 1df339954b1dcc120195b26a6b3a08268dd0041c (commit)
via cebe6225d5bc584b24c2bebf30db353653df34b0 (commit)
via 4de981e5174dffd9a21431017cfa75fc73910b48 (commit)
via 3fdce53f72242381eeda15ad6c3817a4cc88b323 (commit)
via 370295aef1f8ee7cf8b5126de4629b69d1559578 (commit)
via c9f82b175c2f38eeec77cab2906ef480ae558861 (commit)
via 5d564b25e946e3a57fa251271711937e938cd22d (commit)
via 3b09034bd9ad7a95d0d74302c953a5983ff4a417 (commit)
via 6cdeb832bd11c0a12ce577ce10e30cc098bca729 (commit)
via 1580941cb7718eec3931893ec8ac7a2c0c62c363 (commit)
via b211b576cc1287aeb2b541ae6575a3230350d044 (commit)
via 09fe8019a7b688312892be96eacec55fd1f059e7 (commit)
via 1b24a06502a910909cf889916423c94aca92b1cf (commit)
via 11252c8faff0373bf16b7bc42d65dbc5cf5ec57d (commit)
from c434b3e2131b0d5e68d00f887412372e9192a39f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 784e9e6b9ce4cc043bdeba8ca396f59de51cd294
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 17:19:21 2008 +0200
testsuite: enable the testparm_s3 tests.
Michael
(cherry picked from commit 0f5c13e5735990f4325f98156a7dc410276372fe)
commit eff6a48cee0fa6a320728f3bb44c3894dd3f6044
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 17:14:39 2008 +0200
testsuite: add a testparm_s3 test script.
This is a first testparm/lp_load test that runs testparm on a couple
of configuration files. The main purpose for now is to test the options
that have special handlers (to check whether the handlers succeed).
In particular, all the Macro expansions that are available via
alloc_sub_basic() are tested with the include handler. This is to
catch such crashbugs as #5548 where %m expansion led to a segfault.
The tests now are very simple. Just check if testparm completes
successfully on the given config files. This can (and should) be
elaborated in the future.
Michael
(cherry picked from commit eb28146d40b8a8bc2c20b8d222abf191ea178d5a)
commit febf046fc47dd3de3bbb6c0da5b218d73ef0487c
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 19 13:52:49 2008 +0200
testsuite: update introductory comment to test_net_regsistry.sh
This is now used to test rpc and local access depending on
command line parameters.
Michael
(cherry picked from commit 73c17b630317b5019e5d5f2b989b8de081a73e07)
commit b517b0c0f20127876c63cc726afe7f902421af15
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 19 11:59:55 2008 +0200
Fix typo
(cherry picked from commit 2eef2c682c18ad37b78214c755b9dd7c8b607cb8)
commit 1df339954b1dcc120195b26a6b3a08268dd0041c
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 23:54:15 2008 +0200
testsuite: give admin rights to testuser only for the "net rpc registry" test.
Remove the user from BUILTIN\Administrators at the end of the tests.
Note: BUILTIN\Administrators is not deletet at the end because that
functionality is not implemented.
Michael
(cherry picked from commit 1734f9305a38eff05f0147d9c7391ef34085e7b2)
commit cebe6225d5bc584b24c2bebf30db353653df34b0
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 23:51:23 2008 +0200
testsuite: don't give the testuser administrative rights globally.
It breaks RPC-SAMBA3-GETUSERNAME for reasons I have not quite
understood yet. Somhow loosing rights fails when the user
belogns to BUILTIN\Administrators at some point.
Michael
(cherry picked from commit 9fe99c69f35b005b66c1eacb5d999cc73f1bb521)
commit 4de981e5174dffd9a21431017cfa75fc73910b48
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue May 13 14:01:52 2008 +0200
tests_all.sh: Do not execute $SMB4TORTURE --version if it is not available.
Improve error message if no SMB4TORTURE is available.
Karolin
(cherry picked from commit 443691eb2614919043406f94e9c71b49230612d5)
commit 3fdce53f72242381eeda15ad6c3817a4cc88b323
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 23:43:37 2008 +0200
testsuite: allow selection of posix_s3 subtests by env var POSIX_SUBTESTS.
This allows for calling e.g.
TESTS=posix_s3 POSIX_SUBTESTS="RPC-SAMBA3-GETUSERNAME" make test
Michael
(cherry picked from commit 7418d89b2941fff307e0980d1f71f106aed8cbce)
commit 370295aef1f8ee7cf8b5126de4629b69d1559578
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 12:09:59 2008 +0200
testsuite: make structuring output of net_s3 tests stand out more.
say "RUNNING SUBTESTS ..." instead of "Running ... tests"
Michael
(cherry picked from commit 0b879817ba20861c7d0b239d7f7199b0a5ed2ca1)
commit c9f82b175c2f38eeec77cab2906ef480ae558861
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 12:08:27 2008 +0200
testsuite: make diagnostic output more appropriate in tests_all.sh
Say "RUNNING TESTS ..." instead of "RUNNING SUBTESTS ..."
Michael
(cherry picked from commit b73821c392a23c213e4b1ad25a8a2d0c845cee3a)
commit 5d564b25e946e3a57fa251271711937e938cd22d
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 4 18:29:44 2008 +0200
testsuite: give the testuser administrative rights in selftest.sh
(by adding him to builtin\administrators)
Michael
(cherry picked from commit baea0615003cc2db8b27872e87064364f2deb079)
commit 3b09034bd9ad7a95d0d74302c953a5983ff4a417
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 12:01:49 2008 +0200
testsuite: run the net rpc registry tests from the net_s3 tests.
Michael
(cherry picked from commit dcf39078cf0524a7450db3f67c8e004eb42690c2)
commit 6cdeb832bd11c0a12ce577ce10e30cc098bca729
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 4 18:26:34 2008 +0200
testsuite: add the ability to test "net rpc registry" with the net_registry tests
by specifying a parameter "rpc" on the commandline.
Michael
(cherry picked from commit 110c26374ef3e0bdefe2e54db2b8ffd4544780ef)
commit 1580941cb7718eec3931893ec8ac7a2c0c62c363
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 11:43:27 2008 +0200
testsuite: adapt informative message to say "Running _local_ registry tests".
The plan is to also test remote registry with "net rpc registry".
Michael
(cherry picked from commit b5507f8a95399193099a0474fb8b8bc95ba04a48)
commit b211b576cc1287aeb2b541ae6575a3230350d044
Author: Michael Adam <obnox at samba.org>
Date: Tue May 6 11:40:05 2008 +0200
testsuite: use domain==workgroup in wbinfo tests now that we are PDC.
Previously domain==netbios name was the right thing to use.
Michael
(cherry picked from commit a5fc47c2457ce370a4f6150b9f2a417dac7589bf)
commit 09fe8019a7b688312892be96eacec55fd1f059e7
Author: Kai Blin <kai at samba.org>
Date: Sat May 3 01:50:20 2008 +0200
tests: Add a net_misc test.
(cherry picked from commit 026d701aff2c035359894786ec22b4ed829cfb31)
commit 1b24a06502a910909cf889916423c94aca92b1cf
Author: Kai Blin <kai at samba.org>
Date: Mon May 5 15:26:11 2008 +0200
selftest: Advertise as PDC and time server during make test
(cherry picked from commit 65c619b36d08ac2f24b622c71b7e05d50bdeea50)
commit 11252c8faff0373bf16b7bc42d65dbc5cf5ec57d
Author: Kai Blin <kai at samba.org>
Date: Sat May 3 01:45:33 2008 +0200
selftest: Use TESTS env var to specify tests to run like Samba4 does.
(cherry picked from commit 6fb1fe803ccbd3af2946fcbe4586c11d394d5dc2)
-----------------------------------------------------------------------
Summary of changes:
source/script/tests/selftest.sh | 9 ++-
source/script/tests/test_net_misc.sh | 50 ++++++++++++++++
source/script/tests/test_net_registry.sh | 53 +++++++++++++++++-
source/script/tests/test_net_s3.sh | 33 +++++++++++
source/script/tests/test_posix_s3.sh | 4 +
source/script/tests/test_testparm_s3.sh | 90 ++++++++++++++++++++++++++++++
source/script/tests/test_wbinfo_s3.sh | 4 +-
source/script/tests/tests_all.sh | 40 ++++++++-----
8 files changed, 262 insertions(+), 21 deletions(-)
create mode 100755 source/script/tests/test_net_misc.sh
create mode 100755 source/script/tests/test_net_s3.sh
create mode 100755 source/script/tests/test_testparm_s3.sh
Changeset truncated at 500 lines:
diff --git a/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index b53940e..15e48b0 100755
--- a/source/script/tests/selftest.sh
+++ b/source/script/tests/selftest.sh
@@ -6,7 +6,7 @@ if [ $# != 3 ]; then
fi
SMBTORTURE4=$3
-TESTS=$2
+SUBTESTS=$2
##
## create the test directory
@@ -162,6 +162,10 @@ cat >$SERVERCONFFILE<<EOF
passdb backend = tdbsam
+ domain master = yes
+ domain logons = yes
+ time server = yes
+
add user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
add machine script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
delete user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u
@@ -250,6 +254,7 @@ SOCKET_WRAPPER_DEFAULT_IFACE=2
export SOCKET_WRAPPER_DEFAULT_IFACE
samba3_check_or_start
+
# ensure any one smbtorture call doesn't run too long
# and smbtorture will use 127.0.0.6 as source address by default
SOCKET_WRAPPER_DEFAULT_IFACE=6
@@ -290,7 +295,7 @@ START=`date`
failed=0
- . $SCRIPTDIR/tests_$TESTS.sh
+ . $SCRIPTDIR/tests_$SUBTESTS.sh
exit $failed
)
failed=$?
diff --git a/source/script/tests/test_net_misc.sh b/source/script/tests/test_net_misc.sh
new file mode 100755
index 0000000..0a0636a
--- /dev/null
+++ b/source/script/tests/test_net_misc.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# various tests for the "net" command
+
+NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+
+NETTIME="${NET} time"
+NETLOOKUP="${NET} lookup"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_time()
+{
+ PARAM="$1"
+
+ ${NETTIME} ${PARAM} -S localhost2
+}
+
+test_lookup()
+{
+ PARAM="$1"
+
+ ${NETLOOKUP} ${PARAM}
+}
+
+testit "get the time" \
+ test_time || \
+ failed=`expr $failed + 1`
+
+testit "get the system time" \
+ test_time system || \
+ failed=`expr $failed + 1`
+
+testit "get the time zone" \
+ test_time zone || \
+ failed=`expr $failed + 1`
+
+testit "lookup the PDC" \
+ test_lookup pdc || \
+ failed=`expr $failed + 1`
+
+testit "lookup the master browser" \
+ test_lookup master || \
+ failed=`expr $failed + 1`
+
+testok $0 $failed
+
diff --git a/source/script/tests/test_net_registry.sh b/source/script/tests/test_net_registry.sh
index 9ea78cf..b6d2797 100755
--- a/source/script/tests/test_net_registry.sh
+++ b/source/script/tests/test_net_registry.sh
@@ -1,11 +1,17 @@
#!/bin/sh
-# tests for the "net registry" command - local access to the registry db
+# Tests for the "net registry" and "net rpc registry" commands.
+# rpc tests are chose by specifying "rpc" as commandline parameter.
+RPC="$1"
NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
-NETREG="${NET} registry"
+if test "x${RPC}" = "xrpc" ; then
+ NETREG="${NET} -U${USERNAME}%${PASSWORD} -I ${SERVER_IP} rpc registry"
+else
+ NETREG="${NET} registry"
+fi
incdir=`dirname $0`
. $incdir/test_functions.sh
@@ -324,6 +330,40 @@ test_setvalue_twice()
${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE2} ${VALVALUE2}
}
+give_administrative_rights()
+{
+ bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators
+ if test "x$?" != "x0" ; then
+ echo "ERROR: creating builtin group Administrators"
+ false
+ return
+ fi
+
+ bin/net -s $SERVERCONFFILE sam addmem BUILTIN\\Administrators $USERNAME
+ if test "x$?" != "x0" ; then
+ echo "ERROR: adding user $USERNAME to BUILTIN\\Administrators"
+ false
+ else
+ true
+ fi
+}
+
+take_administrative_rights()
+{
+ bin/net -s $SERVERCONFFILE sam delmem BUILTIN\\Administrators $USERNAME
+ if test "x$?" != "x0" ; then
+ echo "ERROR: removing user $USERNAME from BUILTIN\\Administrators"
+ false
+ else
+ true
+ fi
+}
+
+if test "x${RPC}" = "xrpc" ; then
+testit "giving user ${USERNAME} administrative rights" \
+ give_administrative_rights || \
+ failed=`expr $failed +1`
+fi
testit "enumerate HKLM" \
test_enumerate HKLM || \
@@ -337,9 +377,12 @@ testit "enumerate without key" \
test_enumerate_no_key || \
failed=`expr $failed + 1`
+# skip getsd test for registry currently: it fails
+if test "x${RPC}" != "xrpc" ; then
testit "getsd HKLM" \
test_getsd HKLM || \
failed=`expr $failed + 1`
+fi
testit "create existing HKLM" \
test_create_existing || \
@@ -389,5 +432,11 @@ testit "delete key with value" \
test_deletekey HKLM/testkey || \
failed=`expr $failed + 1`
+if test "x${RPC}" = "xrpc" ; then
+testit "taking administrative rights from user ${USERNAME}" \
+ take_administrative_rights || \
+ failed=`expr $failed +1`
+fi
+
testok $0 $failed
diff --git a/source/script/tests/test_net_s3.sh b/source/script/tests/test_net_s3.sh
new file mode 100755
index 0000000..f7dc2b7
--- /dev/null
+++ b/source/script/tests/test_net_s3.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# tests for the "net" command
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+net_misc() {
+ echo "RUNNING SUBTESTS net_misc"
+ $SCRIPTDIR/test_net_misc.sh \
+ || failed=`expr $failed + $?`
+}
+
+net_registry() {
+ echo "RUNNING SUBTESTS net_registry"
+ $SCRIPTDIR/test_net_registry.sh \
+ || failed=`expr $failed + $?`
+}
+
+net_rpc_registry() {
+ echo "RUNNING SUBTESTS net_rpc_registry"
+ $SCRIPTDIR/test_net_registry.sh rpc \
+ || failed=`expr $failed + $?`
+}
+
+net_misc
+net_registry
+net_rpc_registry
+
+testok $0 $failed
+
diff --git a/source/script/tests/test_posix_s3.sh b/source/script/tests/test_posix_s3.sh
index 11f1f0e..3e99986 100755
--- a/source/script/tests/test_posix_s3.sh
+++ b/source/script/tests/test_posix_s3.sh
@@ -46,6 +46,10 @@ unix="UNIX-INFO2"
tests="$base $raw $rpc $unix"
+if test "x$POSIX_SUBTESTS" != "x" ; then
+ tests="$POSIX_SUBTESTS"
+fi
+
skipped="BASE-CHARSET BASE-TCONDEV"
skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
skipped="$skipped RAW-IOCTL"
diff --git a/source/script/tests/test_testparm_s3.sh b/source/script/tests/test_testparm_s3.sh
new file mode 100755
index 0000000..f1316e9
--- /dev/null
+++ b/source/script/tests/test_testparm_s3.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Tests for lp_load() via testparm.
+#
+# The main purpose (for now) is to test all the special handlers
+# and the macro expansions.
+
+TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
+TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_include_expand_macro()
+{
+ MACRO=$1
+ rm -f ${TEMP_CONFFILE}
+ cat >${TEMP_CONFFILE}<<EOF
+[global]
+ include = ${TEMP_CONFFILE}.%${MACRO}
+EOF
+ ${TESTPARM} ${TEMP_CONFFILE}
+}
+
+test_one_global_option()
+{
+ OPTION=$1
+ rm -f ${TEMP_CONFFILE}
+ cat > ${TEMP_CONFFILE}<<EOF
+[global]
+ ${OPTION}
+EOF
+ ${TESTPARM} ${TEMP_CONFFILE}
+}
+
+test_copy()
+{
+ rm -f ${TEMP_CONFFILE}
+ cat > ${TEMP_CONFFILE}<<EOF
+[share1]
+ path = /tmp
+ read only = no
+
+[share2]
+ copy = share1
+EOF
+ ${TESTPARM} ${TEMP_CONFFILE}
+}
+
+
+testit "netbios name" \
+ test_one_global_option "netbios name = funky" || \
+ failed=`expr ${failed} + 1`
+
+testit "netbios aliases" \
+ test_one_global_option "netbios aliases = funky1 funky2 funky3" || \
+ failed=`expr ${failed} + 1`
+
+testit "netbios scope" \
+ test_one_global_option "netbios scope = abc" || \
+ failed=`expr ${failed} + 1`
+
+testit "workgroup" \
+ test_one_global_option "workgroup = samba" || \
+ failed=`expr ${failed} + 1`
+
+testit "display charset" \
+ test_one_global_option "display charset = UTF8" || \
+ failed=`expr ${failed} + 1`
+
+testit "ldap debug level" \
+ test_one_global_option "ldap debug level = 7" || \
+ failed=`expr ${failed} + 1`
+
+for LETTER in U G D I i L N M R T a d h m v w V ; do
+testit "include with %${LETTER} macro expansion" \
+ test_include_expand_macro "${LETTER}" || \
+ failed=`expr ${failed} + 1`
+done
+
+testit "copy" \
+ test_copy || \
+ failed=`expr ${failed} + 1`
+
+rm -f ${TEMP_CONFFILE}
+
+testok $0 ${failed}
+
diff --git a/source/script/tests/test_wbinfo_s3.sh b/source/script/tests/test_wbinfo_s3.sh
index b0b6824..e3bf1b9 100755
--- a/source/script/tests/test_wbinfo_s3.sh
+++ b/source/script/tests/test_wbinfo_s3.sh
@@ -25,10 +25,10 @@ tests="$tests:--own-domain"
tests="$tests:--all-domains"
tests="$tests:--trusted-domains"
tests="$tests:--domain-info=BUILTIN"
-tests="$tests:--domain-info=$server"
+tests="$tests:--domain-info=$domain"
tests="$tests:--online-status"
tests="$tests:--online-status --domain=BUILTIN"
-tests="$tests:--online-status --domain=$server"
+tests="$tests:--online-status --domain=$domain"
#Didn't pass yet# tests="$tests:--domain-users"
tests="$tests:--domain-groups"
tests="$tests:--name-to-sid=$username"
diff --git a/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh
index 5e21537..e44ec8b 100755
--- a/source/script/tests/tests_all.sh
+++ b/source/script/tests/tests_all.sh
@@ -1,58 +1,66 @@
local_s3() {
- echo "RUNNING SUBTESTS local_s3"
+ echo "RUNNING TESTS local_s3"
$SCRIPTDIR/test_local_s3.sh \
|| failed=`expr $failed + $?`
}
smbtorture_s3() {
- echo "RUNNING SUBTESTS smbtorture_s3"
+ echo "RUNNING TESTS smbtorture_s3"
$SCRIPTDIR/test_smbtorture_s3.sh \
//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
|| failed=`expr $failed + $?`
}
smbtorture_s3_encrypted() {
- echo "RUNNING SUBTESTS smbtorture_s3_encrypted"
+ echo "RUNNING TESTS smbtorture_s3_encrypted"
$SCRIPTDIR/test_smbtorture_s3.sh \
//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" \
|| failed=`expr $failed + $?`
}
smbclient_s3() {
- echo "RUNNING SUBTESTS smbclient_s3"
+ echo "RUNNING TESTS smbclient_s3"
$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP \
|| failed=`expr $failed + $?`
}
smbclient_s3_encrypted() {
- echo "RUNNING SUBTESTS smbclient_s3_encrypted"
+ echo "RUNNING TESTS smbclient_s3_encrypted"
$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" \
|| failed=`expr $failed + $?`
}
wbinfo_s3() {
- echo "RUNNING SUBTESTS wbinfo_s3"
+ echo "RUNNING TESTS wbinfo_s3"
$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
|| failed=`expr $failed + $?`
}
ntlm_auth_s3() {
- echo "RUNNING SUBTESTS ntlm_auth_s3"
+ echo "RUNNING TESTS ntlm_auth_s3"
$SCRIPTDIR/test_ntlm_auth_s3.sh \
|| failed=`expr $failed + $?`
}
-net_registry() {
- echo "RUNNING SUBTESTS net_registry"
- $SCRIPTDIR/test_net_registry.sh \
+net_s3() {
+ echo "RUNNING TESTS net_s3"
+ $SCRIPTDIR/test_net_s3.sh \
|| failed=`expr $failed + $?`
}
+testparm_s3() {
+ echo "RUNNING TESTS testparm_s3"
+ $SCRIPTDIR/test_testparm_s3.sh \
+ || failed=`expr $failed +$?`
+}
+
posix_s3() {
- echo "RUNNING SUBTESTS posix_s3"
+ echo "RUNNING TESTS posix_s3"
eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
- SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ if [ -x "$SMBTORTURE4" ]; then
+ SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ fi
if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
echo "Running Tests with Samba4's smbtorture"
echo $SMBTORTURE4VERSION
@@ -61,10 +69,11 @@ posix_s3() {
|| failed=`expr $failed + $?`
else
echo "Skip Tests with Samba4's smbtorture"
+ echo "Try to compile with --with-smbtorture4-path=PATH to enable"
fi
}
-if test "x$RUNTESTS" = "x" ; then
+if test "x$TESTS" = "x" ; then
local_s3
smbtorture_s3
smbtorture_s3_encrypted
@@ -72,10 +81,11 @@ if test "x$RUNTESTS" = "x" ; then
smbclient_s3_encrypted
wbinfo_s3
ntlm_auth_s3
- net_registry
+ net_s3
+ testparm_s3
posix_s3
else
- for THIS_TEST in $RUNTESTS; do
+ for THIS_TEST in $TESTS; do
$THIS_TEST
done
fi
--
Samba Shared Repository
More information about the samba-cvs
mailing list