diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-01 00:36:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:21 -0500 |
| commit | c3077a9e4bd3fd61055a1824946f6f2fb4aec583 (patch) | |
| tree | 0d03996de0570b7ecd9d289a7f3b6cdf3600548e /source4/selftest/selftest.pl | |
| parent | 48029b35201e099aa7bbbe4390b59cfb7a2c6f69 (diff) | |
| download | samba-c3077a9e4bd3fd61055a1824946f6f2fb4aec583.tar.gz samba-c3077a9e4bd3fd61055a1824946f6f2fb4aec583.tar.bz2 samba-c3077a9e4bd3fd61055a1824946f6f2fb4aec583.zip | |
r24860: Make it easier to run selftest.pl in a Samba3 source tree.
(This used to be commit 53ec879e3168e9f56e774f0b0d70aeebb3795f8e)
Diffstat (limited to 'source4/selftest/selftest.pl')
| -rwxr-xr-x | source4/selftest/selftest.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index ad691c77ea..370120ab63 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -406,9 +406,9 @@ if ($opt_socket_wrapper) { my $target; if ($opt_target eq "samba4") { - $target = new Samba4("$srcdir/bin", $ldap, "$srcdir/setup"); + $target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup"); } elsif ($opt_target eq "samba3") { - if ($opt_socket_wrapper and `smbd -b | grep SOCKET_WRAPPER` eq "") { + if ($opt_socket_wrapper and `$opt_bindir/smbd -b | grep SOCKET_WRAPPER` eq "") { die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting...."); } |