summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-21 17:48:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-21 17:48:05 +0200
commite422f638bc3b3780bf5784b1ce218d3e87d068cf (patch)
tree8c07b1c4bf44876955bfeaaf2f391a09f7429b1f /selftest
parentfe02004865144dd5061a6cc9889bef6195de995e (diff)
downloadsamba-e422f638bc3b3780bf5784b1ce218d3e87d068cf.tar.gz
samba-e422f638bc3b3780bf5784b1ce218d3e87d068cf.tar.bz2
samba-e422f638bc3b3780bf5784b1ce218d3e87d068cf.zip
Use socket wrapper for selftest.pl, find binaries correctly.
Diffstat (limited to 'selftest')
-rwxr-xr-xselftest/selftest.pl9
1 files changed, 4 insertions, 5 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index b1908d456c..96b58ccece 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -300,14 +300,12 @@ Target Specific:
--socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
failed
--socket-wrapper enable socket wrapper
+ --bindir=PATH path to target binaries
--expected-failures=FILE specify list of tests that is guaranteed to fail
Samba4 Specific:
--ldap=openldap|fedora-ds back samba onto specified ldap server
-Samba3 Specific:
- --bindir=PATH path to binaries
-
Kvm Specific:
--image=PATH path to KVM image
@@ -447,12 +445,13 @@ if ($opt_target eq "samba4") {
require target::Samba4;
$target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup");
} elsif ($opt_target eq "samba3") {
- if ($opt_socket_wrapper and `$opt_bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
+ my $bindir = ($opt_bindir or "$srcdir/bin");
+ if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
}
$testenv_default = "dc";
require target::Samba3;
- $target = new Samba3($opt_bindir);
+ $target = new Samba3($bindir);
} elsif ($opt_target eq "win") {
die("Windows tests will not run with socket wrapper enabled.")
if ($opt_socket_wrapper);