From 6484da4859fe9b00a7129d89e185bb7947621243 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2011 15:14:31 +1100 Subject: 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 --- selftest/selftest.pl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'selftest/selftest.pl') 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; -- cgit