summaryrefslogtreecommitdiff
path: root/selftest/selftest.pl
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-03 15:14:31 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-07 13:22:00 +1100
commit6484da4859fe9b00a7129d89e185bb7947621243 (patch)
treee62e382fb2288d1dd3e0c352c94a215a2cdefc45 /selftest/selftest.pl
parente7b2e06130fd74a539c58a48c870c9fa1961f699 (diff)
downloadsamba-6484da4859fe9b00a7129d89e185bb7947621243.tar.gz
samba-6484da4859fe9b00a7129d89e185bb7947621243.tar.bz2
samba-6484da4859fe9b00a7129d89e185bb7947621243.zip
s4-test: allow make test to work from top level directory
this fixes the path assumptions in Samba4 make test to allow it to work from the top level directory. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/selftest.pl')
-rwxr-xr-xselftest/selftest.pl4
1 files changed, 1 insertions, 3 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 1da13318cd..3900ebbe33 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -464,7 +464,7 @@ my $testenv_default = "none";
if ($opt_target eq "samba4") {
$testenv_default = "all";
require target::Samba4;
- $target = new Samba4($bindir, $ldap, "$srcdir/setup", $exeext);
+ $target = new Samba4($bindir, $ldap, $srcdir, $exeext);
} elsif ($opt_target eq "samba3") {
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....");
@@ -616,8 +616,6 @@ sub write_clientconf($$$)
my @todo = ();
-my $testsdir = "$srcdir/selftest";
-
sub should_run_test($)
{
my $name = shift;