[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Jan 31 20:19:03 MST 2012
The branch, master has been updated
via 9336658 s3-auth Remove unused nt_status_squash from auth_context
via eecf2ac selftest: Remove unused support for --exeext
from b7d5d01 s3/wscript: Fix dependency on gssapi, necessary when there is no system Kerberos.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 93366586d85389a50144138c788d46703f15d52e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 31 21:34:19 2012 +1100
s3-auth Remove unused nt_status_squash from auth_context
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Wed Feb 1 04:18:50 CET 2012 on sn-devel-104
commit eecf2ac4c83e730dd402c410f7f2087d87d70d6f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jan 26 09:42:27 2012 +1100
selftest: Remove unused support for --exeext
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/tests/test-extended.sh | 6 +-
lib/ldb/tests/test-generic.sh | 72 ++++++++++++++--------------
lib/ldb/tests/test-tdb-features.sh | 34 +++++++-------
lib/ldb/tests/test-tdb.sh | 4 +-
nsswitch/tests/test_wbinfo.sh | 2 +-
selftest/selftest.pl | 14 +----
selftest/selftesthelpers.py | 2 +-
selftest/target/Samba.pm | 8 ++--
selftest/target/Samba3.pm | 4 +-
selftest/target/Samba4.pm | 6 +--
source3/include/auth.h | 1 -
source4/client/tests/test_cifsdd.sh | 2 +-
source4/client/tests/test_smbclient.sh | 2 +-
source4/setup/tests/blackbox_s3upgrade.sh | 6 +-
source4/torture/tests/test_gentest.sh | 2 +-
source4/torture/tests/test_locktest.sh | 2 +-
source4/torture/tests/test_masktest.sh | 2 +-
source4/utils/tests/test_demote.sh | 4 +-
source4/utils/tests/test_nmblookup.sh | 2 +-
source4/utils/tests/test_samba_tool.sh | 4 +-
testprogs/blackbox/test_chgdcpass.sh | 4 +-
testprogs/blackbox/test_export_keytab.sh | 6 +-
testprogs/blackbox/test_kinit.sh | 14 +++---
testprogs/blackbox/test_ktpass.sh | 2 +-
testprogs/blackbox/test_ldb.sh | 2 +-
testprogs/blackbox/test_passwords.sh | 12 ++--
testprogs/blackbox/test_pkinit.sh | 14 +++---
27 files changed, 110 insertions(+), 123 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/tests/test-extended.sh b/lib/ldb/tests/test-extended.sh
index 14b988e..0599757 100755
--- a/lib/ldb/tests/test-extended.sh
+++ b/lib/ldb/tests/test-extended.sh
@@ -4,7 +4,7 @@ echo "Running extended search tests"
mv $LDB_URL $LDB_URL.1
-cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbadd || exit 1
dn: cn=testrec1,cn=TEST
i1: 1
i2: 0
@@ -38,10 +38,10 @@ EOF
checkcount() {
count=$1
expression="$2"
- n=`$VALGRIND ldbsearch$EXEEXT "$expression" | grep '^dn' | wc -l`
+ n=`$VALGRIND ldbsearch "$expression" | grep '^dn' | wc -l`
if [ $n != $count ]; then
echo "Got $n but expected $count for $expression"
- $VALGRIND ldbsearch$EXEEXT "$expression"
+ $VALGRIND ldbsearch "$expression"
exit 1
fi
echo "OK: $count $expression"
diff --git a/lib/ldb/tests/test-generic.sh b/lib/ldb/tests/test-generic.sh
index 7c3db4a..9c45ed9 100755
--- a/lib/ldb/tests/test-generic.sh
+++ b/lib/ldb/tests/test-generic.sh
@@ -8,87 +8,87 @@ fi
echo "LDB_URL: $LDB_URL"
echo "Adding base elements"
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test.ldif || exit 1
+$VALGRIND ldbadd $LDBDIR/tests/test.ldif || exit 1
echo "Adding again - should fail"
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test.ldif 2> /dev/null && {
+$VALGRIND ldbadd $LDBDIR/tests/test.ldif 2> /dev/null && {
echo "Should have failed to add again - gave $?"
exit 1
}
echo "Modifying elements"
-$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/test-modify.ldif || exit 1
+$VALGRIND ldbmodify $LDBDIR/tests/test-modify.ldif || exit 1
echo "Showing modified record"
-$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1
+$VALGRIND ldbsearch '(uid=uham)' || exit 1
echo "Rename entry with ldbmodify - modrdn"
-$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/test-modify-modrdn.ldif || exit 1
+$VALGRIND ldbmodify $LDBDIR/tests/test-modify-modrdn.ldif || exit 1
echo "Rename entry with ldbrename"
OLDDN="cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST"
NEWDN="cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST"
-$VALGRIND ldbrename$EXEEXT "$OLDDN" "$NEWDN" || exit 1
+$VALGRIND ldbrename "$OLDDN" "$NEWDN" || exit 1
echo "Showing renamed record"
-$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1
+$VALGRIND ldbsearch '(uid=uham)' || exit 1
echo "Starting ldbtest"
-$VALGRIND ldbtest$EXEEXT --num-records 100 --num-searches 10 || exit 1
+$VALGRIND ldbtest --num-records 100 --num-searches 10 || exit 1
if [ $LDB_SPECIALS = 1 ]; then
echo "Adding index"
- $VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-index.ldif || exit 1
+ $VALGRIND ldbadd $LDBDIR/tests/test-index.ldif || exit 1
fi
echo "Adding bad attributes - should fail"
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-wrong_attributes.ldif && {
+$VALGRIND ldbadd $LDBDIR/tests/test-wrong_attributes.ldif && {
echo "Should fhave failed - gave $?"
exit 1
}
echo "Testing indexed search"
-$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham))' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(|(uid=uham)(uid=uham))' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(|(uid=uham)(uid=uham)(objectclass=OpenLDAPperson))' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham)(!(objectclass=xxx)))' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid \* \+ dn || exit 1
-$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uha*)(title=*))' uid || exit 1
+$VALGRIND ldbsearch '(uid=uham)' || exit 1
+$VALGRIND ldbsearch '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1
+$VALGRIND ldbsearch '(&(uid=uham)(uid=uham))' || exit 1
+$VALGRIND ldbsearch '(|(uid=uham)(uid=uham))' || exit 1
+$VALGRIND ldbsearch '(|(uid=uham)(uid=uham)(objectclass=OpenLDAPperson))' || exit 1
+$VALGRIND ldbsearch '(&(uid=uham)(uid=uham)(!(objectclass=xxx)))' || exit 1
+$VALGRIND ldbsearch '(&(objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid \* \+ dn || exit 1
+$VALGRIND ldbsearch '(&(uid=uham)(uid=uha*)(title=*))' uid || exit 1
echo "Testing invalid search expression"
-$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(title=foo\blah))' uid && exit 1
+$VALGRIND ldbsearch '(&(uid=uham)(title=foo\blah))' uid && exit 1
# note that the "((" is treated as an attribute not an expression
# this matches the openldap ldapsearch behaviour of looking for a '='
# to see if the first argument is an expression or not
-$VALGRIND ldbsearch$EXEEXT '((' uid || exit 1
-$VALGRIND ldbsearch$EXEEXT '(objectclass=)' uid || exit 1
-$VALGRIND ldbsearch$EXEEXT -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST' -s base "" sn || exit 1
+$VALGRIND ldbsearch '((' uid || exit 1
+$VALGRIND ldbsearch '(objectclass=)' uid || exit 1
+$VALGRIND ldbsearch -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST' -s base "" sn || exit 1
echo "Test wildcard match"
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-wildcard.ldif || exit 1
-$VALGRIND ldbsearch$EXEEXT '(cn=test*multi)' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(cn=*test*multi*)' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(cn=*test_multi)' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(cn=test_multi*)' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(cn=test*multi*test*multi)' || exit 1
-$VALGRIND ldbsearch$EXEEXT '(cn=test*multi*test*multi*multi_*)' || exit 1
+$VALGRIND ldbadd $LDBDIR/tests/test-wildcard.ldif || exit 1
+$VALGRIND ldbsearch '(cn=test*multi)' || exit 1
+$VALGRIND ldbsearch '(cn=*test*multi*)' || exit 1
+$VALGRIND ldbsearch '(cn=*test_multi)' || exit 1
+$VALGRIND ldbsearch '(cn=test_multi*)' || exit 1
+$VALGRIND ldbsearch '(cn=test*multi*test*multi)' || exit 1
+$VALGRIND ldbsearch '(cn=test*multi*test*multi*multi_*)' || exit 1
echo "Starting ldbtest indexed"
-$VALGRIND ldbtest$EXEEXT --num-records 100 --num-searches 500 || exit 1
+$VALGRIND ldbtest --num-records 100 --num-searches 500 || exit 1
echo "Testing one level search"
-count=`$VALGRIND ldbsearch$EXEEXT -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep '^dn' | wc -l`
+count=`$VALGRIND ldbsearch -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep '^dn' | wc -l`
if [ $count != 3 ]; then
echo returned $count records - expected 3
exit 1
fi
echo "Testing binary file attribute value"
-$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/photo.ldif || exit 1
-count=`$VALGRIND ldbsearch$EXEEXT '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l`
+$VALGRIND ldbmodify $LDBDIR/tests/photo.ldif || exit 1
+count=`$VALGRIND ldbsearch '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l`
if [ $count != 1 ]; then
echo returned $count records - expected 1
exit 1
@@ -97,13 +97,13 @@ fi
echo "*TODO* Testing UTF8 upper lower case searches !!"
echo "Testing compare"
-count=`$VALGRIND ldbsearch$EXEEXT '(cn>=t)' cn | grep '^dn' | wc -l`
+count=`$VALGRIND ldbsearch '(cn>=t)' cn | grep '^dn' | wc -l`
if [ $count != 2 ]; then
echo returned $count records - expected 2
echo "this fails on openLdap ..."
fi
-count=`$VALGRIND ldbsearch$EXEEXT '(cn<=t)' cn | grep '^dn' | wc -l`
+count=`$VALGRIND ldbsearch '(cn<=t)' cn | grep '^dn' | wc -l`
if [ $count != 13 ]; then
echo returned $count records - expected 13
echo "this fails on openLdap ..."
@@ -114,7 +114,7 @@ checkcount() {
scope=$2
basedn=$3
expression="$4"
- n=`$VALGRIND ldbsearch$EXEEXT -s "$scope" -b "$basedn" "$expression" | grep '^dn' | wc -l`
+ n=`$VALGRIND ldbsearch -s "$scope" -b "$basedn" "$expression" | grep '^dn' | wc -l`
if [ $n != $count ]; then
echo "Got $n but expected $count for $expression"
bin/ldbsearch "$expression"
diff --git a/lib/ldb/tests/test-tdb-features.sh b/lib/ldb/tests/test-tdb-features.sh
index d424836..14437ff 100644
--- a/lib/ldb/tests/test-tdb-features.sh
+++ b/lib/ldb/tests/test-tdb-features.sh
@@ -7,17 +7,17 @@ mv $LDB_URL $LDB_URL.2
checkcount() {
count=$1
expression="$2"
- n=`$VALGRIND ldbsearch$EXEEXT "$expression" | grep '^dn' | wc -l`
+ n=`$VALGRIND ldbsearch "$expression" | grep '^dn' | wc -l`
if [ $n != $count ]; then
echo "Got $n but expected $count for $expression"
- $VALGRIND ldbsearch$EXEEXT "$expression"
+ $VALGRIND ldbsearch "$expression"
exit 1
fi
echo "OK: $count $expression"
}
echo "Testing case sensitive search"
-cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbadd || exit 1
dn: cn=t1,cn=TEST
objectClass: testclass
test: foo
@@ -27,20 +27,20 @@ checkcount 0 '(test=FOO)'
checkcount 0 '(test=FO*)'
echo "Making case insensitive"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES
changetype: add
add: test
test: CASE_INSENSITIVE
EOF
-echo $ldif | $VALGRIND ldbmodify$EXEEXT || exit 1
+echo $ldif | $VALGRIND ldbmodify || exit 1
checkcount 1 '(test=foo)'
checkcount 1 '(test=FOO)'
checkcount 1 '(test=fo*)'
echo "adding i"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: cn=t1,cn=TEST
changetype: modify
add: i
@@ -50,7 +50,7 @@ checkcount 1 '(i=0x100)'
checkcount 0 '(i=256)'
echo "marking i as INTEGER"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES
changetype: modify
add: i
@@ -60,7 +60,7 @@ checkcount 1 '(i=0x100)'
checkcount 1 '(i=256)'
echo "adding j"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: cn=t1,cn=TEST
changetype: modify
add: j
@@ -70,7 +70,7 @@ checkcount 1 '(j=0x100)'
checkcount 0 '(j=256)'
echo "Adding wildcard attribute"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES
changetype: modify
add: *
@@ -84,7 +84,7 @@ checkcount 0 '(objectClass=otherclass)'
checkcount 1 '(objectClass=testclass)'
echo "Adding index"
-cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbadd || exit 1
dn: @INDEXLIST
@IDXATTR: i
@IDXATTR: test
@@ -97,7 +97,7 @@ checkcount 1 '(test=FOO)'
checkcount 1 '(test=*f*o)'
echo "making test case sensitive"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES
changetype: modify
replace: test
@@ -111,17 +111,17 @@ checkone() {
count=$1
base="$2"
expression="$3"
- n=`$VALGRIND ldbsearch$EXEEXT -s one -b "$base" "$expression" | grep '^dn' | wc -l`
+ n=`$VALGRIND ldbsearch -s one -b "$base" "$expression" | grep '^dn' | wc -l`
if [ $n != $count ]; then
echo "Got $n but expected $count for $expression"
- $VALGRIND ldbsearch$EXEEXT -s one -b "$base" "$expression"
+ $VALGRIND ldbsearch -s one -b "$base" "$expression"
exit 1
fi
echo "OK: $count $expression"
}
echo "Removing wildcard attribute"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES
changetype: modify
delete: *
@@ -129,7 +129,7 @@ delete: *
EOF
echo "Adding one level indexes"
-cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @INDEXLIST
changetype: modify
add: @IDXONE
@@ -137,14 +137,14 @@ add: @IDXONE
EOF
echo "Testing one level indexed search"
-cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbadd || exit 1
dn: cn=one,cn=t1,cn=TEST
objectClass: oneclass
cn: one
test: one
EOF
checkone 1 "cn=t1,cn=TEST" '(test=one)'
-cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbadd || exit 1
dn: cn=two,cn=t1,cn=TEST
objectClass: oneclass
cn: two
diff --git a/lib/ldb/tests/test-tdb.sh b/lib/ldb/tests/test-tdb.sh
index 9da1e57..c2285a9 100755
--- a/lib/ldb/tests/test-tdb.sh
+++ b/lib/ldb/tests/test-tdb.sh
@@ -17,12 +17,12 @@ if [ -z "$LDBDIR" ]; then
export LDBDIR
fi
-cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat <<EOF | $VALGRIND ldbadd || exit 1
dn: @MODULES
@LIST: rdn_name
EOF
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/init.ldif || exit 1
+$VALGRIND ldbadd $LDBDIR/tests/init.ldif || exit 1
. $LDBDIR/tests/test-generic.sh
diff --git a/nsswitch/tests/test_wbinfo.sh b/nsswitch/tests/test_wbinfo.sh
index 50f1274..52e203f 100755
--- a/nsswitch/tests/test_wbinfo.sh
+++ b/nsswitch/tests/test_wbinfo.sh
@@ -15,7 +15,7 @@ shift 4
failed=0
samba4bindir="$BINDIR"
-wbinfo="$VALGRIND $samba4bindir/wbinfo$EXEEXT"
+wbinfo="$VALGRIND $samba4bindir/wbinfo"
. `dirname $0`/../../testprogs/blackbox/subunit.sh
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index c56f31f..e5ccbd8 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 fc81c63..991574e 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 d993611..64bc405 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 10f673f..b710d54 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 fa7988f..52c6d68 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,
--
Samba Shared Repository
More information about the samba-cvs
mailing list