summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@sernet.private>2009-11-16 18:00:42 +0100
committerStefan Metzmacher <metze@samba.org>2009-11-17 09:00:48 +0100
commit475015507172f708f295ff29e1feaec08a6476e0 (patch)
treec82d2d26fc8cb8d1a15345b1757ecf8774829bb9
parent39072c70d2656e62576a4f82238cdefc79ef2124 (diff)
downloadsamba-475015507172f708f295ff29e1feaec08a6476e0.tar.gz
samba-475015507172f708f295ff29e1feaec08a6476e0.tar.bz2
samba-475015507172f708f295ff29e1feaec08a6476e0.zip
s4:selftest: use "dc:local" instead of a hardcoded config file
If a tests needs access to the dc's config, it should run as "dc:local", then it can also access unix named pipes... If we pass a hardcoded config file the test fails if you use a selftest_prefix. metze
-rwxr-xr-xsource4/selftest/tests.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 75914a5eea..6130e91e38 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -279,7 +279,7 @@ done
plantest "rpc.echo on ncacn_np over smb2" dc $smb4torture ncacn_np:"\$SERVER[smb2]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
-plantest "ntp.signd" dc $smb4torture ncacn_np:"\$SERVER" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN NTP-SIGND "$*" --configfile=st/dc/etc/smb.conf
+plantest "ntp.signd" dc:local $smb4torture ncacn_np:"\$SERVER" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN NTP-SIGND "$*"
# Tests against the NTVFS POSIX backend
NTVFSARGS=""
@@ -339,8 +339,8 @@ planperltest "selftest.samba4.pl" none $samba4srcdir/../selftest/test_samba4.pl
plantest "blackbox.ndrdump" none $samba4srcdir/librpc/tests/test_ndrdump.sh
plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION
-plantest "blackbox.passwords" dc $bbdir/test_passwords.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" --configfile=st/dc/etc/smb.conf
-plantest "blackbox.export.keytab" dc $bbdir/test_export_keytab.sh "\$SERVER" "\$USERNAME" "\$REALM" "\$DOMAIN" "$PREFIX" --configfile=st/dc/etc/smb.conf
+plantest "blackbox.passwords" dc:local $bbdir/test_passwords.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX"
+plantest "blackbox.export.keytab" dc:local $bbdir/test_export_keytab.sh "\$SERVER" "\$USERNAME" "\$REALM" "\$DOMAIN" "$PREFIX"
plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.nmblookup" dc $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"