selftest: Remove unused support for --exeext

5 files changed, 11 insertions, 23 deletions

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index c56f31f376..e5ccbd8f37 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -26,7 +26,7 @@ selftest - Samba test runner
 
 selftest --help
 
-selftest [--srcdir=DIR] [--bindir=DIR] [--exeext=EXT][--target=samba|samba3|win] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--testlist=FILE] [TESTS]
+selftest [--srcdir=DIR] [--bindir=DIR] [--target=samba|samba3|win] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--testlist=FILE] [TESTS]
 
 =head1 DESCRIPTION
 
@@ -48,10 +48,6 @@ Source directory.
 
 Built binaries directory.
 
-=item I<--exeext=EXT>
-
-Executable extention
-
 =item I<--prefix=DIR>
 
 Change directory to run tests in. Default is 'st'.
@@ -161,7 +157,6 @@ my @testlists = ();
 
 my $srcdir = ".";
 my $bindir = "./bin";
-my $exeext = "";
 my $prefix = "./st";
 
 my @includes = ();
@@ -306,7 +301,6 @@ Paths:
  --prefix=DIR               prefix to run tests in [st]
  --srcdir=DIR               source directory [.]
  --bindir=DIR               binaries directory [./bin]
- --exeext=EXT               executable extention []
 
 Target Specific:
  --socket-wrapper-pcap      save traffic to pcap directories
@@ -340,7 +334,6 @@ my $result = GetOptions (
 		'include=s' => \@opt_include,
 		'srcdir=s' => \$srcdir,
 		'bindir=s' => \$bindir,
-		'exeext=s' => \$exeext,
 		'verbose' => \$opt_verbose,
 		'testenv' => \$opt_testenv,
 		'list' => \$opt_list,
@@ -418,7 +411,6 @@ $ENV{PREFIX_ABS} = $prefix_abs;
 $ENV{SRCDIR} = $srcdir;
 $ENV{SRCDIR_ABS} = $srcdir_abs;
 $ENV{BINDIR} = $bindir_abs;
-$ENV{EXEEXT} = $exeext;
 
 my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
@@ -485,14 +477,14 @@ unless ($opt_list) {
 		}
 		$testenv_default = "dc";
 		require target::Samba;
-		$target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime);
+		$target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $server_maxtime);
 	} 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....");
 		}
 		$testenv_default = "member";
 		require target::Samba3;
-		$target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $exeext, $server_maxtime);
+		$target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);
 	} elsif ($opt_target eq "win") {
 		die("Windows tests will not run with socket wrapper enabled.") 
 			if ($opt_socket_wrapper);
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index fc81c63664..991574e05f 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -36,7 +36,7 @@ binary_mapping = {}
 def binpath(name):
     if name in binary_mapping:
         name = binary_mapping[name]
-    return os.path.join(bindir(), "%s%s" % (name, os.getenv("EXEEXT", "")))
+    return os.path.join(bindir(), name)
 
 binary_mapping_string = os.getenv("BINARY_MAPPING", None)
 if binary_mapping_string is not None:
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index d993611eda..64bc405137 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -10,11 +10,11 @@ use target::Samba3;
 use target::Samba4;
 
 sub new($$$$$) {
-	my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $exeext, $server_maxtime) = @_;
+	my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $server_maxtime) = @_;
 
 	my $self = {
-	    samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $exeext, $server_maxtime),
-	    samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime),
+	    samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $server_maxtime),
+	    samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $server_maxtime),
 	};
 	bless $self;
 	return $self;
@@ -53,7 +53,7 @@ sub bindir_path($$) {
 	    $path = $object->{binary_mapping}->{$path};
 	}
 
-	my $valpath = "$object->{bindir}/$path$object->{exeext}";
+	my $valpath = "$object->{bindir}/$path";
 
 	return $valpath if (-f $valpath);
 	return $path;
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 10f673ffcf..b710d5466d 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -12,13 +12,11 @@ use POSIX;
 use target::Samba;
 
 sub new($$) {
-	my ($classname, $bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime) = @_;
-	$exeext = "" unless defined($exeext);
+	my ($classname, $bindir, $binary_mapping, $srcdir, $server_maxtime) = @_;
 	my $self = { vars => {},
 		     bindir => $bindir,
 		     binary_mapping => $binary_mapping,
 		     srcdir => $srcdir,
-		     exeext => $exeext,
 		     server_maxtime => $server_maxtime
 	};
 	bless $self;
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index fa7988f67a..52c6d680d7 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -14,8 +14,7 @@ use target::Samba;
 use target::Samba3;
 
 sub new($$$$$) {
-	my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime) = @_;
-	$exeext = "" unless defined($exeext);
+	my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $server_maxtime) = @_;
 
 	my $self = {
 		vars => {},
@@ -23,9 +22,8 @@ sub new($$$$$) {
 		bindir => $bindir,
 		binary_mapping => $binary_mapping,
 		srcdir => $srcdir,
-		exeext => $exeext,
 		server_maxtime => $server_maxtime,
-		target3 => new Samba3($bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime)
+		target3 => new Samba3($bindir, $binary_mapping, $srcdir, $server_maxtime)
 	};
 	bless $self;
 	return $self;