diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-21 16:32:38 +1100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-11-22 10:21:16 +0100 |
| commit | 8a2ef49dea36b103a87cf2aa63417737dd754ce6 (patch) | |
| tree | 97e5fd48481171e45542383215be1921fbcef3bc /source3/selftest | |
| parent | ef195a18aac1f2b1ebfd34741d2242f659896549 (diff) | |
| download | samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.tar.gz samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.tar.xz samba-8a2ef49dea36b103a87cf2aa63417737dd754ce6.zip | |
build: Be consistent with the name of smbtorture binaries
This ensures that in both build systems, smbtorture3 is the source3 binary, and
smbtoture is our main smbtorture binary, built with waf.
Also included in this is the removal of bin/ndrdump4 as a special case.
This removes the last cases of binaries with different names in
each build system.
Andrew Bartlett
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/selftest')
| -rwxr-xr-x | source3/selftest/s3-selftest.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh index 335398a466..10cf115a59 100755 --- a/source3/selftest/s3-selftest.sh +++ b/source3/selftest/s3-selftest.sh @@ -24,7 +24,7 @@ st_test_done() { if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then ( rm -f ${SELFTESTPREFIX}/st_done && \ ${PERL} ${SELFTESTDIR}/selftest.pl \ - --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth \ + --binary-mapping=smbtorture3:smbtorture3,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth,smbtorture4:smbtorture \ --prefix=${SELFTESTPREFIX} --target=samba3 \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ --exclude=${SELFTESTDIR}/skip \ @@ -38,7 +38,7 @@ if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then else ( rm -f ${SELFTESTPREFIX}/st_done && \ ${PERL} ${SELFTESTDIR}/selftest.pl \ - --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth \ + --binary-mapping=smbtorture3:smbtorture3,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth,smbtorture4:smbtorture \ --prefix=${SELFTESTPREFIX} --target=samba3 \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ --exclude=${SELFTESTDIR}/skip \ |