From 47ad5d27eb2ec3ec660a91658afd599df8570562 Mon Sep 17 00:00:00 2001 From: Adrian Cochrane Date: Fri, 5 Jun 2015 15:18:19 +1200 Subject: [PATCH] selftest: Apply rename filepath arguments so binary mapping doesn't have to. Signed-off-by: Adrian Cochrane Reviewed-by: Andrew Bartlett Reviewed-by: Michael Adam --- selftest/selftesthelpers.py | 6 +++--- selftest/target/Samba3.pm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index fc2937c4bdd..8cd2a937293 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -161,7 +161,7 @@ samba3srcdir = source3dir() bbdir = os.path.join(srcdir(), "testprogs/blackbox") configuration = "--configfile=$SMB_CONF_PATH" -smbtorture4 = binpath("smbtorture4") +smbtorture4 = binpath("smbtorture") smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines() smbtorture4_options = [ @@ -187,9 +187,9 @@ def smbtorture4_testsuites(prefix): return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list) -smbclient3 = binpath('smbclient3') +smbclient3 = binpath('smbclient') smbtorture3 = binpath('smbtorture3') -ntlm_auth3 = binpath('ntlm_auth3') +ntlm_auth3 = binpath('ntlm_auth') net = binpath('net') scriptdir = os.path.join(srcdir(), "script/tests") diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index bc52263809b..b45adddaf26 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1558,7 +1558,7 @@ sub wait_for_start($$$$$) my $count = 0; do { - $ret = system(Samba::bindir_path($self, "smbclient3") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139"); + $ret = system(Samba::bindir_path($self, "smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139"); if ($ret != 0) { sleep(2); }