From eecf2ac4c83e730dd402c410f7f2087d87d70d6f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Jan 2012 09:42:27 +1100 Subject: selftest: Remove unused support for --exeext --- 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 +-- 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 +++--- 26 files changed, 110 insertions(+), 122 deletions(-) diff --git a/lib/ldb/tests/test-extended.sh b/lib/ldb/tests/test-extended.sh index 14b988e3f9..0599757cc5 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 < /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 d4248366ca..14437ffb9a 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 < - -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; diff --git a/source4/client/tests/test_cifsdd.sh b/source4/client/tests/test_cifsdd.sh index 448e4218bd..e59d37ae7b 100755 --- a/source4/client/tests/test_cifsdd.sh +++ b/source4/client/tests/test_cifsdd.sh @@ -17,7 +17,7 @@ DOMAIN=$4 . `dirname $0`/../../../testprogs/blackbox/subunit.sh samba4bindir="$BINDIR" -DD="$samba4bindir/cifsdd$EXEEXT" +DD="$samba4bindir/cifsdd" SHARE=tmp DEBUGLEVEL=1 diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh index 76ca5b960b..599eb70522 100755 --- a/source4/client/tests/test_smbclient.sh +++ b/source4/client/tests/test_smbclient.sh @@ -19,7 +19,7 @@ shift 5 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient$EXEEXT" +smbclient="$samba4bindir/smbclient" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh index b9e500dd01..d8f5d8fced 100755 --- a/source4/setup/tests/blackbox_s3upgrade.sh +++ b/source4/setup/tests/blackbox_s3upgrade.sh @@ -11,9 +11,9 @@ PREFIX=`pwd`"/$1" shift 1 samba4bindir="$BINDIR" -samba_tool="$samba4bindir/samba-tool$EXEEXT" -samba_net="$samba4bindir/net$EXEEXT" -testparm="$samba4bindir/testparm$EXEEXT" +samba_tool="$samba4bindir/samba-tool" +samba_net="$samba4bindir/net" +testparm="$samba4bindir/testparm" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh index 9f6e60c307..ecce7d7c6d 100755 --- a/source4/torture/tests/test_gentest.sh +++ b/source4/torture/tests/test_gentest.sh @@ -19,7 +19,7 @@ shift 5 failed=0 samba4bindir="$BINDIR" -gentest="$samba4bindir/gentest$EXEEXT" +gentest="$samba4bindir/gentest" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh index e1d2a1ade4..c436836353 100755 --- a/source4/torture/tests/test_locktest.sh +++ b/source4/torture/tests/test_locktest.sh @@ -19,7 +19,7 @@ shift 5 failed=0 samba4bindir="$BINDIR" -locktest="$samba4bindir/locktest$EXEEXT" +locktest="$samba4bindir/locktest" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh index b3362e8960..83f2f5d72e 100755 --- a/source4/torture/tests/test_masktest.sh +++ b/source4/torture/tests/test_masktest.sh @@ -19,7 +19,7 @@ shift 5 failed=0 samba4bindir="$BINDIR" -masktest="$samba4bindir/masktest$EXEEXT" +masktest="$samba4bindir/masktest" . `dirname $0`/../../../testprogs/blackbox/subunit.sh diff --git a/source4/utils/tests/test_demote.sh b/source4/utils/tests/test_demote.sh index 3b2b7d2d0e..3d255ed91f 100755 --- a/source4/utils/tests/test_demote.sh +++ b/source4/utils/tests/test_demote.sh @@ -13,8 +13,8 @@ shift 7 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba_tool="$samba4bindir/samba-tool$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba_tool="$samba4bindir/samba-tool" testit() { name="$1" diff --git a/source4/utils/tests/test_nmblookup.sh b/source4/utils/tests/test_nmblookup.sh index b6ab7e01e5..c622db94c8 100755 --- a/source4/utils/tests/test_nmblookup.sh +++ b/source4/utils/tests/test_nmblookup.sh @@ -27,7 +27,7 @@ testit() { } 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 \$NETBIOSNAME" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSNAME diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh index fb8e3e092f..0e03ee4d75 100755 --- a/source4/utils/tests/test_samba_tool.sh +++ b/source4/utils/tests/test_samba_tool.sh @@ -11,8 +11,8 @@ shift 5 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba_tool="$samba4bindir/samba-tool$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba_tool="$samba4bindir/samba-tool" testit() { name="$1" diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh index d54cfeff10..66c1e57359 100755 --- a/testprogs/blackbox/test_chgdcpass.sh +++ b/testprogs/blackbox/test_chgdcpass.sh @@ -22,8 +22,8 @@ failed=0 samba4bindir="$BINDIR" samba4srcdir="$SRCDIR/source4" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba4kinit="$samba4bindir/samba4kinit$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba4kinit="$samba4bindir/samba4kinit" machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache" diff --git a/testprogs/blackbox/test_export_keytab.sh b/testprogs/blackbox/test_export_keytab.sh index a2debfef1c..14122bfe71 100755 --- a/testprogs/blackbox/test_export_keytab.sh +++ b/testprogs/blackbox/test_export_keytab.sh @@ -19,9 +19,9 @@ shift 5 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba4kinit="$samba4bindir/samba4kinit$EXEEXT" -samba_tool="$samba4bindir/samba-tool$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba4kinit="$samba4bindir/samba4kinit" +samba_tool="$samba4bindir/samba-tool" newuser="$samba_tool user create" . `dirname $0`/subunit.sh diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh index 293115fc09..981987d03f 100755 --- a/testprogs/blackbox/test_kinit.sh +++ b/testprogs/blackbox/test_kinit.sh @@ -22,13 +22,13 @@ failed=0 samba4bindir="$BINDIR" samba4srcdir="$SRCDIR/source4" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba4kinit="$samba4bindir/samba4kinit$EXEEXT" -samba_tool="$samba4bindir/samba-tool$EXEEXT" -ldbmodify="$samba4bindir/ldbmodify$EXEEXT" -ldbsearch="$samba4bindir/ldbsearch$EXEEXT" -rkpty="$samba4bindir/rkpty$EXEEXT" -samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba4kinit="$samba4bindir/samba4kinit" +samba_tool="$samba4bindir/samba-tool" +ldbmodify="$samba4bindir/ldbmodify" +ldbsearch="$samba4bindir/ldbsearch" +rkpty="$samba4bindir/rkpty" +samba4kpasswd="$samba4bindir/samba4kpasswd" enableaccount="$samba_tool user enable" machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache" diff --git a/testprogs/blackbox/test_ktpass.sh b/testprogs/blackbox/test_ktpass.sh index 348916d779..f9672facab 100755 --- a/testprogs/blackbox/test_ktpass.sh +++ b/testprogs/blackbox/test_ktpass.sh @@ -16,7 +16,7 @@ shift 1 samba_tool="$BINDIR/samba-tool" samba4bindir="$BINDIR" samba4srcdir="$SRCDIR/source4" -samba4kinit="$samba4bindir/samba4kinit$EXEEXT" +samba4kinit="$samba4bindir/samba4kinit" CONFIG="--configfile=$PREFIX/dc/etc/smb.conf" TESTUSER="ktpassUser" diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh index 644e344823..1609a95d06 100755 --- a/testprogs/blackbox/test_ldb.sh +++ b/testprogs/blackbox/test_ldb.sh @@ -34,7 +34,7 @@ check() { 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` diff --git a/testprogs/blackbox/test_passwords.sh b/testprogs/blackbox/test_passwords.sh index 9e65b3095b..c83b46b4fc 100755 --- a/testprogs/blackbox/test_passwords.sh +++ b/testprogs/blackbox/test_passwords.sh @@ -20,12 +20,12 @@ shift 6 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba4kinit="$samba4bindir/samba4kinit$EXEEXT" -samba_tool="$samba4bindir/samba-tool$EXEEXT" -smbpasswd="$samba4bindir/smbpasswd$EXEEXT" -rkpty="$samba4bindir/rkpty$EXEEXT" -samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba4kinit="$samba4bindir/samba4kinit" +samba_tool="$samba4bindir/samba-tool" +smbpasswd="$samba4bindir/smbpasswd" +rkpty="$samba4bindir/rkpty" +samba4kpasswd="$samba4bindir/samba4kpasswd" newuser="$samba_tool user create" . `dirname $0`/subunit.sh diff --git a/testprogs/blackbox/test_pkinit.sh b/testprogs/blackbox/test_pkinit.sh index b4e91e782a..f5caccd390 100755 --- a/testprogs/blackbox/test_pkinit.sh +++ b/testprogs/blackbox/test_pkinit.sh @@ -22,13 +22,13 @@ failed=0 samba4bindir="$BINDIR" samba4srcdir="$SRCDIR/source4" -smbclient="$samba4bindir/smbclient$EXEEXT" -samba4kinit="$samba4bindir/samba4kinit$EXEEXT" -samba_tool="$samba4bindir/samba-tool$EXEEXT" -ldbmodify="$samba4bindir/ldbmodify$EXEEXT" -ldbsearch="$samba4bindir/ldbsearch$EXEEXT" -rkpty="$samba4bindir/rkpty$EXEEXT" -samba4kpasswd="$samba4bindir/samba4kpasswd$EXEEXT" +smbclient="$samba4bindir/smbclient" +samba4kinit="$samba4bindir/samba4kinit" +samba_tool="$samba4bindir/samba-tool" +ldbmodify="$samba4bindir/ldbmodify" +ldbsearch="$samba4bindir/ldbsearch" +rkpty="$samba4bindir/rkpty" +samba4kpasswd="$samba4bindir/samba4kpasswd" enableaccount="$samba_tool user enable" machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache" -- cgit