Merge branch 'master' of ssh://git.samba.org/data/git/samba

2 files changed, 39 insertions, 18 deletions

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 292a2d2dd6..6f0883c585 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -13,7 +13,7 @@ selftest - Samba test runner
 
 selftest --help
 
-selftest [--srcdir=DIR] [--builddir=DIR] [--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--immediate] [--testlist=FILE] [TESTS]
+selftest [--srcdir=DIR] [--builddir=DIR] [--exeext=EXT][--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--immediate] [--testlist=FILE] [TESTS]
 
 =head1 DESCRIPTION
 
@@ -35,6 +35,10 @@ Source directory.
 
 Build directory.
 
+=item I<--exeext=EXT>
+
+Executable extention
+
 =item I<--prefix=DIR>
 
 Change directory to run tests in. Default is 'st'.
@@ -156,6 +160,7 @@ my @testlists = ();
 
 my $srcdir = ".";
 my $builddir = ".";
+my $exeext = "";
 my $prefix = "./st";
 
 my @expected_failures = ();
@@ -294,6 +299,7 @@ Paths:
  --prefix=DIR               prefix to run tests in [st]
  --srcdir=DIR               source directory [.]
  --builddir=DIR             output directory [.]
+ --exeext=EXT               executable extention []
 
 Target Specific:
  --socket-wrapper-pcap	    save traffic to pcap directories
@@ -334,6 +340,7 @@ my $result = GetOptions (
 		'include=s' => \@opt_include,
 		'srcdir=s' => \$srcdir,
 		'builddir=s' => \$builddir,
+		'exeext=s' => \$exeext,
 		'verbose' => \$opt_verbose,
 		'testenv' => \$opt_testenv,
 		'ldap:s' => \$ldap,
@@ -443,9 +450,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....");
 	}
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1dfb67e896..83f62d45ec 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -10,18 +10,26 @@ use Cwd qw(abs_path);
 use FindBin qw($RealBin);
 use POSIX;
 
-sub new($$$$) {
-	my ($classname, $bindir, $ldap, $setupdir) = @_;
+sub new($$$$$) {
+	my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_;
+	$exeext = "" unless defined($exeext);
 	my $self = { 
 		vars => {}, 
 		ldap => $ldap, 
 		bindir => $bindir, 
-		setupdir => $setupdir 
+		setupdir => $setupdir,
+		exeext => $exeext
 	};
 	bless $self;
 	return $self;
 }
 
+sub bindir_path($$) {
+	my ($self, $path) = @_;
+
+	return "$self->{bindir}/$path$self->{exeext}";
+}
+
 sub openldap_start($$$) {
         my ($slapd_conf, $uri, $logs) = @_;
   	my $oldpath = $ENV{PATH};
@@ -50,7 +58,8 @@ sub slapd_start($$)
 	} elsif ($self->{ldap} eq "openldap") {
 	        openldap_start($env_vars->{SLAPD_CONF}, $uri, "$env_vars->{LDAPDIR}/logs");
 	}
-	while (system("$self->{bindir}/ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") != 0) {
+	my $ldbsearch = $self->bindir_path("ldbsearch");
+	while (system("$ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") != 0) {
 	        $count++;
 		if ($count > 40) {
 		    $self->slapd_stop($env_vars);
@@ -116,20 +125,21 @@ sub check_or_start($$$)
 		if (defined($ENV{SMBD_OPTIONS})) {
 			$optarg.= " $ENV{SMBD_OPTIONS}";
 		}
-		my $ret = system("$valgrind $self->{bindir}/samba $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
+		my $samba = $self->bindir_path("samba");
+		my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
 		if ($? == -1) {
-			print "Unable to start samba: $ret: $!\n";
+			print "Unable to start $samba: $ret: $!\n";
 			exit 1;
 		}
 		unlink($env_vars->{SMBD_TEST_FIFO});
 		my $exit = $? >> 8;
 		if ( $ret == 0 ) {
-			print "samba exits with status $exit\n";
+			print "$samba exits with status $exit\n";
 		} elsif ( $ret & 127 ) {
-			print "samba got signal ".($ret & 127)." and exits with $exit!\n";
+			print "$samba got signal ".($ret & 127)." and exits with $exit!\n";
 		} else {
 			$ret = $? >> 8;
-			print "samba failed with status $exit!\n";
+			print "$samba failed with status $exit!\n";
 		}
 		exit $exit;
 	}
@@ -169,7 +179,8 @@ sub write_ldb_file($$$)
 {
 	my ($self, $file, $ldif) = @_;
 
-	open(LDIF, "|$self->{bindir}/ldbadd -H $file >/dev/null");
+	my $ldbadd = $self->bindir_path("ldbadd");
+	open(LDIF, "|$ldbadd -H $file >/dev/null");
 	print LDIF $ldif;
 	return close(LDIF);
 }
@@ -690,12 +701,13 @@ nogroup:x:65534:nobody
 	close(GRP);
 
 #Ensure the config file is valid before we start
-	if (system("$self->{bindir}/testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) {
-		system("$self->{bindir}/testparm -v --suppress-prompt $configuration >&2");
-		die("Failed to create a valid smb.conf configuration!");
+	my $testparm = $self->bindir_path("testparm");
+	if (system("$testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) {
+		system("$testparm -v --suppress-prompt $configuration >&2");
+		die("Failed to create a valid smb.conf configuration $testparm!");
 	}
 
-	(system("($self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$netbiosname\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global");
+	(system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$netbiosname\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global");
 
 	my @provision_options = ();
 	push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
@@ -792,10 +804,11 @@ sub provision_member($$$)
 
 	$ret or die("Unable to provision");
 
+	my $net = $self->bindir_path("net");
 	my $cmd = "";
 	$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
 	$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
-	$cmd .= "$self->{bindir}/net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
+	$cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{DOMAIN} member";
 	$cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
 
 	system($cmd) == 0 or die("Join failed\n$cmd");