sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

selftest: Remove unused support for --exeext

Browse Source
This commit is contained in:
Andrew Bartlett 2012-01-26 09:42:27 +11:00
parent b7d5d01c35
commit eecf2ac4c8
26 changed files with 110 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ldb/tests/test-extended.sh
View File

@ -4,7 +4,7 @@ echo "Running extended search tests"
mv $LDB_URL $LDB_URL.1 mv $LDB_URL $LDB_URL.1
cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbadd || exit 1
dn: cn=testrec1,cn=TEST dn: cn=testrec1,cn=TEST
i1: 1 i1: 1
i2: 0 i2: 0
@ -38,10 +38,10 @@ EOF
checkcount() { checkcount() {
count=$1 count=$1
expression="$2" expression="$2"
n=`$VALGRIND ldbsearch$EXEEXT "$expression" | grep '^dn' | wc -l` n=`$VALGRIND ldbsearch "$expression" | grep '^dn' | wc -l`
if [ $n != $count ]; then if [ $n != $count ]; then
echo "Got $n but expected $count for $expression" echo "Got $n but expected $count for $expression"
$VALGRIND ldbsearch$EXEEXT "$expression" $VALGRIND ldbsearch "$expression"
exit 1 exit 1
fi fi
echo "OK: $count $expression" echo "OK: $count $expression"

72
lib/ldb/tests/test-generic.sh
View File

@ -8,87 +8,87 @@ fi
echo "LDB_URL: $LDB_URL" echo "LDB_URL: $LDB_URL"
echo "Adding base elements" 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" 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 $?" echo "Should have failed to add again - gave $?"
exit 1 exit 1
} }
echo "Modifying elements" 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" echo "Showing modified record"
$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1 $VALGRIND ldbsearch '(uid=uham)' || exit 1
echo "Rename entry with ldbmodify - modrdn" 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" echo "Rename entry with ldbrename"
OLDDN="cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST" 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" 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" echo "Showing renamed record"
$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1 $VALGRIND ldbsearch '(uid=uham)' || exit 1
echo "Starting ldbtest" 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 if [ $LDB_SPECIALS = 1 ]; then
echo "Adding index" echo "Adding index"
$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-index.ldif || exit 1 $VALGRIND ldbadd $LDBDIR/tests/test-index.ldif || exit 1
fi fi
echo "Adding bad attributes - should fail" 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 $?" echo "Should fhave failed - gave $?"
exit 1 exit 1
} }
echo "Testing indexed search" echo "Testing indexed search"
$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1 $VALGRIND ldbsearch '(uid=uham)' || exit 1
$VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1 $VALGRIND ldbsearch '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1
$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham))' || exit 1 $VALGRIND ldbsearch '(&(uid=uham)(uid=uham))' || exit 1
$VALGRIND ldbsearch$EXEEXT '(|(uid=uham)(uid=uham))' || exit 1 $VALGRIND ldbsearch '(|(uid=uham)(uid=uham))' || exit 1
$VALGRIND ldbsearch$EXEEXT '(|(uid=uham)(uid=uham)(objectclass=OpenLDAPperson))' || exit 1 $VALGRIND ldbsearch '(|(uid=uham)(uid=uham)(objectclass=OpenLDAPperson))' || exit 1
$VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham)(!(objectclass=xxx)))' || exit 1 $VALGRIND ldbsearch '(&(uid=uham)(uid=uham)(!(objectclass=xxx)))' || exit 1
$VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid \* \+ dn || exit 1 $VALGRIND ldbsearch '(&(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)(uid=uha*)(title=*))' uid || exit 1
echo "Testing invalid search expression" 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 # note that the "((" is treated as an attribute not an expression
# this matches the openldap ldapsearch behaviour of looking for a '=' # this matches the openldap ldapsearch behaviour of looking for a '='
# to see if the first argument is an expression or not # to see if the first argument is an expression or not
$VALGRIND ldbsearch$EXEEXT '((' uid || exit 1 $VALGRIND ldbsearch '((' uid || exit 1
$VALGRIND ldbsearch$EXEEXT '(objectclass=)' uid || exit 1 $VALGRIND ldbsearch '(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 -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST' -s base "" sn || exit 1
echo "Test wildcard match" echo "Test wildcard match"
$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-wildcard.ldif || exit 1 $VALGRIND ldbadd $LDBDIR/tests/test-wildcard.ldif || exit 1
$VALGRIND ldbsearch$EXEEXT '(cn=test*multi)' || exit 1 $VALGRIND ldbsearch '(cn=test*multi)' || exit 1
$VALGRIND ldbsearch$EXEEXT '(cn=*test*multi*)' || exit 1 $VALGRIND ldbsearch '(cn=*test*multi*)' || exit 1
$VALGRIND ldbsearch$EXEEXT '(cn=*test_multi)' || exit 1 $VALGRIND ldbsearch '(cn=*test_multi)' || exit 1
$VALGRIND ldbsearch$EXEEXT '(cn=test_multi*)' || exit 1 $VALGRIND ldbsearch '(cn=test_multi*)' || exit 1
$VALGRIND ldbsearch$EXEEXT '(cn=test*multi*test*multi)' || exit 1 $VALGRIND ldbsearch '(cn=test*multi*test*multi)' || exit 1
$VALGRIND ldbsearch$EXEEXT '(cn=test*multi*test*multi*multi_*)' || exit 1 $VALGRIND ldbsearch '(cn=test*multi*test*multi*multi_*)' || exit 1
echo "Starting ldbtest indexed" 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" 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 if [ $count != 3 ]; then
echo returned $count records - expected 3 echo returned $count records - expected 3
exit 1 exit 1
fi fi
echo "Testing binary file attribute value" echo "Testing binary file attribute value"
$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/photo.ldif || exit 1 $VALGRIND ldbmodify $LDBDIR/tests/photo.ldif || exit 1
count=`$VALGRIND ldbsearch$EXEEXT '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l` count=`$VALGRIND ldbsearch '(cn=Hampster Ursula)' jpegPhoto | grep '^dn' | wc -l`
if [ $count != 1 ]; then if [ $count != 1 ]; then
echo returned $count records - expected 1 echo returned $count records - expected 1
exit 1 exit 1
@ -97,13 +97,13 @@ fi
echo "*TODO* Testing UTF8 upper lower case searches !!" echo "*TODO* Testing UTF8 upper lower case searches !!"
echo "Testing compare" 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 if [ $count != 2 ]; then
echo returned $count records - expected 2 echo returned $count records - expected 2
echo "this fails on openLdap ..." echo "this fails on openLdap ..."
fi 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 if [ $count != 13 ]; then
echo returned $count records - expected 13 echo returned $count records - expected 13
echo "this fails on openLdap ..." echo "this fails on openLdap ..."
@ -114,7 +114,7 @@ checkcount() {
scope=$2 scope=$2
basedn=$3 basedn=$3
expression="$4" 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 if [ $n != $count ]; then
echo "Got $n but expected $count for $expression" echo "Got $n but expected $count for $expression"
bin/ldbsearch "$expression" bin/ldbsearch "$expression"

34
lib/ldb/tests/test-tdb-features.sh
View File

@ -7,17 +7,17 @@ mv $LDB_URL $LDB_URL.2
checkcount() { checkcount() {
count=$1 count=$1
expression="$2" expression="$2"
n=`$VALGRIND ldbsearch$EXEEXT "$expression" | grep '^dn' | wc -l` n=`$VALGRIND ldbsearch "$expression" | grep '^dn' | wc -l`
if [ $n != $count ]; then if [ $n != $count ]; then
echo "Got $n but expected $count for $expression" echo "Got $n but expected $count for $expression"
$VALGRIND ldbsearch$EXEEXT "$expression" $VALGRIND ldbsearch "$expression"
exit 1 exit 1
fi fi
echo "OK: $count $expression" echo "OK: $count $expression"
} }
echo "Testing case sensitive search" echo "Testing case sensitive search"
cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbadd || exit 1
dn: cn=t1,cn=TEST dn: cn=t1,cn=TEST
objectClass: testclass objectClass: testclass
test: foo test: foo
@ -27,20 +27,20 @@ checkcount 0 '(test=FOO)'
checkcount 0 '(test=FO*)' checkcount 0 '(test=FO*)'
echo "Making case insensitive" echo "Making case insensitive"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES dn: @ATTRIBUTES
changetype: add changetype: add
add: test add: test
test: CASE_INSENSITIVE test: CASE_INSENSITIVE
EOF 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=FOO)' checkcount 1 '(test=FOO)'
checkcount 1 '(test=fo*)' checkcount 1 '(test=fo*)'
echo "adding i" echo "adding i"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: cn=t1,cn=TEST dn: cn=t1,cn=TEST
changetype: modify changetype: modify
add: i add: i
@ -50,7 +50,7 @@ checkcount 1 '(i=0x100)'
checkcount 0 '(i=256)' checkcount 0 '(i=256)'
echo "marking i as INTEGER" echo "marking i as INTEGER"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES dn: @ATTRIBUTES
changetype: modify changetype: modify
add: i add: i
@ -60,7 +60,7 @@ checkcount 1 '(i=0x100)'
checkcount 1 '(i=256)' checkcount 1 '(i=256)'
echo "adding j" echo "adding j"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: cn=t1,cn=TEST dn: cn=t1,cn=TEST
changetype: modify changetype: modify
add: j add: j
@ -70,7 +70,7 @@ checkcount 1 '(j=0x100)'
checkcount 0 '(j=256)' checkcount 0 '(j=256)'
echo "Adding wildcard attribute" echo "Adding wildcard attribute"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES dn: @ATTRIBUTES
changetype: modify changetype: modify
add: * add: *
@ -84,7 +84,7 @@ checkcount 0 '(objectClass=otherclass)'
checkcount 1 '(objectClass=testclass)' checkcount 1 '(objectClass=testclass)'
echo "Adding index" echo "Adding index"
cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbadd || exit 1
dn: @INDEXLIST dn: @INDEXLIST
@IDXATTR: i @IDXATTR: i
@IDXATTR: test @IDXATTR: test
@ -97,7 +97,7 @@ checkcount 1 '(test=FOO)'
checkcount 1 '(test=*f*o)' checkcount 1 '(test=*f*o)'
echo "making test case sensitive" echo "making test case sensitive"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES dn: @ATTRIBUTES
changetype: modify changetype: modify
replace: test replace: test
@ -111,17 +111,17 @@ checkone() {
count=$1 count=$1
base="$2" base="$2"
expression="$3" 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 if [ $n != $count ]; then
echo "Got $n but expected $count for $expression" 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 exit 1
fi fi
echo "OK: $count $expression" echo "OK: $count $expression"
} }
echo "Removing wildcard attribute" echo "Removing wildcard attribute"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @ATTRIBUTES dn: @ATTRIBUTES
changetype: modify changetype: modify
delete: * delete: *
@ -129,7 +129,7 @@ delete: *
EOF EOF
echo "Adding one level indexes" echo "Adding one level indexes"
cat <<EOF | $VALGRIND ldbmodify$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbmodify || exit 1
dn: @INDEXLIST dn: @INDEXLIST
changetype: modify changetype: modify
add: @IDXONE add: @IDXONE
@ -137,14 +137,14 @@ add: @IDXONE
EOF EOF
echo "Testing one level indexed search" 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 dn: cn=one,cn=t1,cn=TEST
objectClass: oneclass objectClass: oneclass
cn: one cn: one
test: one test: one
EOF EOF
checkone 1 "cn=t1,cn=TEST" '(test=one)' 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 dn: cn=two,cn=t1,cn=TEST
objectClass: oneclass objectClass: oneclass
cn: two cn: two

4
lib/ldb/tests/test-tdb.sh
View File

@ -17,12 +17,12 @@ if [ -z "$LDBDIR" ]; then
export LDBDIR export LDBDIR
fi fi
cat <<EOF | $VALGRIND ldbadd$EXEEXT || exit 1 cat <<EOF | $VALGRIND ldbadd || exit 1
dn: @MODULES dn: @MODULES
@LIST: rdn_name @LIST: rdn_name
EOF EOF
$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/init.ldif || exit 1 $VALGRIND ldbadd $LDBDIR/tests/init.ldif || exit 1
. $LDBDIR/tests/test-generic.sh . $LDBDIR/tests/test-generic.sh

2
nsswitch/tests/test_wbinfo.sh
View File

@ -15,7 +15,7 @@ shift 4
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
wbinfo="$VALGRIND $samba4bindir/wbinfo$EXEEXT" wbinfo="$VALGRIND $samba4bindir/wbinfo"
. `dirname $0`/../../testprogs/blackbox/subunit.sh . `dirname $0`/../../testprogs/blackbox/subunit.sh

14
selftest/selftest.pl
View File

@ -26,7 +26,7 @@ selftest - Samba test runner
selftest --help 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 =head1 DESCRIPTION
@ -48,10 +48,6 @@ Source directory.
Built binaries directory. Built binaries directory.
=item I<--exeext=EXT>
Executable extention
=item I<--prefix=DIR> =item I<--prefix=DIR>
Change directory to run tests in. Default is 'st'. Change directory to run tests in. Default is 'st'.
@ -161,7 +157,6 @@ my @testlists = ();
my $srcdir = "."; my $srcdir = ".";
my $bindir = "./bin"; my $bindir = "./bin";
my $exeext = "";
my $prefix = "./st"; my $prefix = "./st";
my @includes = (); my @includes = ();
@ -306,7 +301,6 @@ Paths:
--prefix=DIR prefix to run tests in [st] --prefix=DIR prefix to run tests in [st]
--srcdir=DIR source directory [.] --srcdir=DIR source directory [.]
--bindir=DIR binaries directory [./bin] --bindir=DIR binaries directory [./bin]
--exeext=EXT executable extention []
Target Specific: Target Specific:
--socket-wrapper-pcap save traffic to pcap directories --socket-wrapper-pcap save traffic to pcap directories
@ -340,7 +334,6 @@ my $result = GetOptions (
'include=s' => \@opt_include, 'include=s' => \@opt_include,
'srcdir=s' => \$srcdir, 'srcdir=s' => \$srcdir,
'bindir=s' => \$bindir, 'bindir=s' => \$bindir,
'exeext=s' => \$exeext,
'verbose' => \$opt_verbose, 'verbose' => \$opt_verbose,
'testenv' => \$opt_testenv, 'testenv' => \$opt_testenv,
'list' => \$opt_list, 'list' => \$opt_list,
@ -418,7 +411,6 @@ $ENV{PREFIX_ABS} = $prefix_abs;
$ENV{SRCDIR} = $srcdir; $ENV{SRCDIR} = $srcdir;
$ENV{SRCDIR_ABS} = $srcdir_abs; $ENV{SRCDIR_ABS} = $srcdir_abs;
$ENV{BINDIR} = $bindir_abs; $ENV{BINDIR} = $bindir_abs;
$ENV{EXEEXT} = $exeext;
my $tls_enabled = not $opt_quick; my $tls_enabled = not $opt_quick;
$ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no"); $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
@ -485,14 +477,14 @@ unless ($opt_list) {
} }
$testenv_default = "dc"; $testenv_default = "dc";
require target::Samba; 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") { } elsif ($opt_target eq "samba3") {
if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") { 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...."); die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
} }
$testenv_default = "member"; $testenv_default = "member";
require target::Samba3; 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") { } elsif ($opt_target eq "win") {
die("Windows tests will not run with socket wrapper enabled.") die("Windows tests will not run with socket wrapper enabled.")
if ($opt_socket_wrapper); if ($opt_socket_wrapper);

2
selftest/selftesthelpers.py
View File

@ -36,7 +36,7 @@ binary_mapping = {}
def binpath(name): def binpath(name):
if name in binary_mapping: if name in binary_mapping:
name = binary_mapping[name] 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) binary_mapping_string = os.getenv("BINARY_MAPPING", None)
if binary_mapping_string is not None: if binary_mapping_string is not None:

8
selftest/target/Samba.pm
View File

@ -10,11 +10,11 @@ use target::Samba3;
use target::Samba4; use target::Samba4;
sub new($$$$$) { sub new($$$$$) {
my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $exeext, $server_maxtime) = @_; my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $server_maxtime) = @_;
my $self = { my $self = {
samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $exeext, $server_maxtime), samba3 => new Samba3($bindir,$binary_mapping, $srcdir, $server_maxtime),
samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime), samba4 => new Samba4($bindir,$binary_mapping, $ldap, $srcdir, $server_maxtime),
}; };
bless $self; bless $self;
return $self; return $self;
@ -53,7 +53,7 @@ sub bindir_path($$) {
$path = $object->{binary_mapping}->{$path}; $path = $object->{binary_mapping}->{$path};
} }
my $valpath = "$object->{bindir}/$path$object->{exeext}"; my $valpath = "$object->{bindir}/$path";
return $valpath if (-f $valpath); return $valpath if (-f $valpath);
return $path; return $path;

4
selftest/target/Samba3.pm
View File

@ -12,13 +12,11 @@ use POSIX;
use target::Samba; use target::Samba;
sub new($$) { sub new($$) {
my ($classname, $bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime) = @_; my ($classname, $bindir, $binary_mapping, $srcdir, $server_maxtime) = @_;
$exeext = "" unless defined($exeext);
my $self = { vars => {}, my $self = { vars => {},
bindir => $bindir, bindir => $bindir,
binary_mapping => $binary_mapping, binary_mapping => $binary_mapping,
srcdir => $srcdir, srcdir => $srcdir,
exeext => $exeext,
server_maxtime => $server_maxtime server_maxtime => $server_maxtime
}; };
bless $self; bless $self;

6
selftest/target/Samba4.pm
View File

@ -14,8 +14,7 @@ use target::Samba;
use target::Samba3; use target::Samba3;
sub new($$$$$) { sub new($$$$$) {
my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime) = @_; my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $server_maxtime) = @_;
$exeext = "" unless defined($exeext);
my $self = { my $self = {
vars => {}, vars => {},
@ -23,9 +22,8 @@ sub new($$$$$) {
bindir => $bindir, bindir => $bindir,
binary_mapping => $binary_mapping, binary_mapping => $binary_mapping,
srcdir => $srcdir, srcdir => $srcdir,
exeext => $exeext,
server_maxtime => $server_maxtime, 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; bless $self;
return $self; return $self;

2
source4/client/tests/test_cifsdd.sh
View File

@ -17,7 +17,7 @@ DOMAIN=$4
. `dirname $0`/../../../testprogs/blackbox/subunit.sh . `dirname $0`/../../../testprogs/blackbox/subunit.sh
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
DD="$samba4bindir/cifsdd$EXEEXT" DD="$samba4bindir/cifsdd"
SHARE=tmp SHARE=tmp
DEBUGLEVEL=1 DEBUGLEVEL=1

2
source4/client/tests/test_smbclient.sh
View File

@ -19,7 +19,7 @@ shift 5
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh . `dirname $0`/../../../testprogs/blackbox/subunit.sh

6
source4/setup/tests/blackbox_s3upgrade.sh
View File

@ -11,9 +11,9 @@ PREFIX=`pwd`"/$1"
shift 1 shift 1
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
samba_net="$samba4bindir/net$EXEEXT" samba_net="$samba4bindir/net"
testparm="$samba4bindir/testparm$EXEEXT" testparm="$samba4bindir/testparm"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh . `dirname $0`/../../../testprogs/blackbox/subunit.sh

2
source4/torture/tests/test_gentest.sh
View File

@ -19,7 +19,7 @@ shift 5
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
gentest="$samba4bindir/gentest$EXEEXT" gentest="$samba4bindir/gentest"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh . `dirname $0`/../../../testprogs/blackbox/subunit.sh

2
source4/torture/tests/test_locktest.sh
View File

@ -19,7 +19,7 @@ shift 5
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
locktest="$samba4bindir/locktest$EXEEXT" locktest="$samba4bindir/locktest"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh . `dirname $0`/../../../testprogs/blackbox/subunit.sh

2
source4/torture/tests/test_masktest.sh
View File

@ -19,7 +19,7 @@ shift 5
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
masktest="$samba4bindir/masktest$EXEEXT" masktest="$samba4bindir/masktest"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh . `dirname $0`/../../../testprogs/blackbox/subunit.sh

4
source4/utils/tests/test_demote.sh
View File

@ -13,8 +13,8 @@ shift 7
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
testit() { testit() {
name="$1" name="$1"

2
source4/utils/tests/test_nmblookup.sh
View File

@ -27,7 +27,7 @@ testit() {
} }
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
nmblookup="$samba4bindir/nmblookup$EXEEXT" nmblookup="$samba4bindir/nmblookup"
testit "nmblookup -U \$SERVER_IP \$SERVER" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $SERVER testit "nmblookup -U \$SERVER_IP \$SERVER" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $SERVER
testit "nmblookup -U \$SERVER_IP \$NETBIOSNAME" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSNAME testit "nmblookup -U \$SERVER_IP \$NETBIOSNAME" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSNAME

4
source4/utils/tests/test_samba_tool.sh
View File

@ -11,8 +11,8 @@ shift 5
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
testit() { testit() {
name="$1" name="$1"

4
testprogs/blackbox/test_chgdcpass.sh
View File

@ -22,8 +22,8 @@ failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4" samba4srcdir="$SRCDIR/source4"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT" samba4kinit="$samba4bindir/samba4kinit"
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache" machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"

6
testprogs/blackbox/test_export_keytab.sh
View File

@ -19,9 +19,9 @@ shift 5
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT" samba4kinit="$samba4bindir/samba4kinit"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
newuser="$samba_tool user create" newuser="$samba_tool user create"
. `dirname $0`/subunit.sh . `dirname $0`/subunit.sh

14
testprogs/blackbox/test_kinit.sh
View File

@ -22,13 +22,13 @@ failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4" samba4srcdir="$SRCDIR/source4"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT" samba4kinit="$samba4bindir/samba4kinit"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
ldbmodify="$samba4bindir/ldbmodify$EXEEXT" ldbmodify="$samba4bindir/ldbmodify"
ldbsearch="$samba4bindir/ldbsearch$EXEEXT" ldbsearch="$samba4bindir/ldbsearch"
rkpty="$samba4bindir/rkpty$EXEEXT" rkpty="$samba4bindir/rkpty"
samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" samba4kpasswd="$samba4bindir/samba4kpasswd"
enableaccount="$samba_tool user enable" enableaccount="$samba_tool user enable"
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache" machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"

2
testprogs/blackbox/test_ktpass.sh
View File

@ -16,7 +16,7 @@ shift 1
samba_tool="$BINDIR/samba-tool" samba_tool="$BINDIR/samba-tool"
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4" samba4srcdir="$SRCDIR/source4"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT" samba4kinit="$samba4bindir/samba4kinit"
CONFIG="--configfile=$PREFIX/dc/etc/smb.conf" CONFIG="--configfile=$PREFIX/dc/etc/smb.conf"
TESTUSER="ktpassUser" TESTUSER="ktpassUser"

2
testprogs/blackbox/test_ldb.sh
View File

@ -34,7 +34,7 @@ check() {
export PATH="$BINDIR:$PATH" export PATH="$BINDIR:$PATH"
ldbsearch="$VALGRIND ldbsearch$EXEEXT" ldbsearch="$VALGRIND ldbsearch"
check "RootDSE" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1` check "RootDSE" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1`

12
testprogs/blackbox/test_passwords.sh
View File

@ -20,12 +20,12 @@ shift 6
failed=0 failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT" samba4kinit="$samba4bindir/samba4kinit"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
smbpasswd="$samba4bindir/smbpasswd$EXEEXT" smbpasswd="$samba4bindir/smbpasswd"
rkpty="$samba4bindir/rkpty$EXEEXT" rkpty="$samba4bindir/rkpty"
samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" samba4kpasswd="$samba4bindir/samba4kpasswd"
newuser="$samba_tool user create" newuser="$samba_tool user create"
. `dirname $0`/subunit.sh . `dirname $0`/subunit.sh

14
testprogs/blackbox/test_pkinit.sh
View File

@ -22,13 +22,13 @@ failed=0
samba4bindir="$BINDIR" samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4" samba4srcdir="$SRCDIR/source4"
smbclient="$samba4bindir/smbclient$EXEEXT" smbclient="$samba4bindir/smbclient"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT" samba4kinit="$samba4bindir/samba4kinit"
samba_tool="$samba4bindir/samba-tool$EXEEXT" samba_tool="$samba4bindir/samba-tool"
ldbmodify="$samba4bindir/ldbmodify$EXEEXT" ldbmodify="$samba4bindir/ldbmodify"
ldbsearch="$samba4bindir/ldbsearch$EXEEXT" ldbsearch="$samba4bindir/ldbsearch"
rkpty="$samba4bindir/rkpty$EXEEXT" rkpty="$samba4bindir/rkpty"
samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" samba4kpasswd="$samba4bindir/samba4kpasswd"
enableaccount="$samba_tool user enable" enableaccount="$samba_tool user enable"
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache" machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"