summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-05-29 16:35:18 +0200
committerMichael Adam <obnox@samba.org>2012-05-31 04:46:06 +0200
commitfef5ce7f0f53b2a33bd30ff8ebe639f622520d20 (patch)
tree9ea142cfd9b51894470016ec9d6cf385c0c6c93d
parentf6e6086ad06e86a0bf6e6bc636b1cef477568aed (diff)
downloadsamba-fef5ce7f0f53b2a33bd30ff8ebe639f622520d20.tar.gz
samba-fef5ce7f0f53b2a33bd30ff8ebe639f622520d20.tar.bz2
samba-fef5ce7f0f53b2a33bd30ff8ebe639f622520d20.zip
s4:selftest: determine nmblookup via binary mapping for blackbox test in tests.py
-rwxr-xr-xsource4/selftest/tests.py4
-rwxr-xr-xsource4/utils/tests/test_nmblookup.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 8279ba4041..f16557de39 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -33,6 +33,8 @@ if validate:
else:
validate_list = []
+nmblookup = binpath('nmblookup4')
+
def plansmbtorturetestsuite(name, env, options, modname=None):
if modname is None:
modname = "samba4.%s" % name
@@ -309,7 +311,7 @@ plantestsuite("samba4.blackbox.ktpass(dc)", "dc", [os.path.join(bbdir, "test_ktp
plantestsuite("samba4.blackbox.passwords(dc:local)", "dc:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX"])
plantestsuite("samba4.blackbox.export.keytab(dc:local)", "dc:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX"])
plantestsuite("samba4.blackbox.cifsdd(dc)", "dc", [os.path.join(samba4srcdir, "client/tests/test_cifsdd.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "$DOMAIN"])
-plantestsuite("samba4.blackbox.nmblookup(dc)", "dc", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP'])
+plantestsuite("samba4.blackbox.nmblookup(dc)", "dc", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP', nmblookup])
plantestsuite("samba4.blackbox.locktest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_locktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
plantestsuite("samba4.blackbox.masktest", "dc", [os.path.join(samba4srcdir, "torture/tests/test_masktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
plantestsuite("samba4.blackbox.gentest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_gentest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', "$PREFIX"])
diff --git a/source4/utils/tests/test_nmblookup.sh b/source4/utils/tests/test_nmblookup.sh
index c622db94c8..5e4fcfb406 100755
--- a/source4/utils/tests/test_nmblookup.sh
+++ b/source4/utils/tests/test_nmblookup.sh
@@ -5,7 +5,8 @@ NETBIOSNAME=$1
NETBIOSALIAS=$2
SERVER=$3
SERVER_IP=$4
-shift 4
+nmblookup=$5
+shift 5
TORTURE_OPTIONS=$*
failed=0
@@ -26,9 +27,6 @@ testit() {
return $status
}
-samba4bindir="$BINDIR"
-nmblookup="$samba4bindir/nmblookup"
-
testit "nmblookup -U \$SERVER_IP \$SERVER" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $SERVER
testit "nmblookup -U \$SERVER_IP \$NETBIOSNAME" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSNAME
testit "nmblookup -U \$SERVER_IP \$NETBIOSALIAS" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSALIAS