From e422f638bc3b3780bf5784b1ce218d3e87d068cf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 21 Oct 2008 17:48:05 +0200 Subject: Use socket wrapper for selftest.pl, find binaries correctly. --- selftest/selftest.pl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'selftest') diff --git a/selftest/selftest.pl b/selftest/selftest.pl index b1908d456cb..96b58cceceb 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); -- cgit