summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-21 10:05:53 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-21 13:35:35 +0100
commitac364b4bab0f0b48eb3cf46cd174ecf2bd6f60e3 (patch)
treebf216f42586e25da3ed79a3305c730f71b1e0919
parent74471512745d22fc997184dd27977fdf6410ac46 (diff)
downloadsamba-ac364b4bab0f0b48eb3cf46cd174ecf2bd6f60e3.tar.gz
samba-ac364b4bab0f0b48eb3cf46cd174ecf2bd6f60e3.tar.bz2
samba-ac364b4bab0f0b48eb3cf46cd174ecf2bd6f60e3.zip
selftest: bin/ is under $(builddir) instead of $(srcdir)
metze
-rwxr-xr-xselftest/selftest.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 292a2d2dd6..fd0b85c9b0 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -443,9 +443,10 @@ my $testenv_default = "none";
if ($opt_target eq "samba4") {
$testenv_default = "member";
require target::Samba4;
- $target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup");
+ $target = new Samba4($opt_bindir or "$builddir/bin",
+ $ldap, "$srcdir/setup", $exeext);
} elsif ($opt_target eq "samba3") {
- my $bindir = ($opt_bindir or "$srcdir/bin");
+ my $bindir = ($opt_bindir or "$builddir/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....");
}