From 8a2ef49dea36b103a87cf2aa63417737dd754ce6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 21 Nov 2012 16:32:38 +1100 Subject: 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 --- source3/Makefile-smbtorture | 24 ++++++++++++++++++++++++ source3/Makefile-smbtorture4 | 30 ------------------------------ source3/Makefile.in | 17 +++++++---------- source3/configure.in | 22 +++++++++++----------- source3/selftest/s3-selftest.sh | 4 ++-- 5 files changed, 44 insertions(+), 53 deletions(-) create mode 100644 source3/Makefile-smbtorture delete mode 100644 source3/Makefile-smbtorture4 (limited to 'source3') diff --git a/source3/Makefile-smbtorture b/source3/Makefile-smbtorture new file mode 100644 index 0000000000..4b5b143cfe --- /dev/null +++ b/source3/Makefile-smbtorture @@ -0,0 +1,24 @@ +WAF_BINARY=buildtools/bin/waf +WAF=$(WAF_BINARY) +WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) +SAMBA4_BINARIES="smbtorture" + +samba4-configure: + @(cd .. && \ + CFLAGS='' $(WAF) reconfigure || \ + CFLAGS='' $(WAF) configure --enable-selftest --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-debug) + +.PHONY: samba4-configure + +bin/smbtorture: $(BINARY_PREREQS) samba4-configure samba4-config-compare + cd .. && $(WAF_BUILD) --targets=smbtorture + cp ../bin/smbtorture bin/smbtorture + +.PHONY: bin/smbtorture + +samba4-config-compare: samba4-configure + @echo "Comparing config.h from autoconf and waf" + @echo "Configure results missing from WAF are:" + ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h + @echo "Configure results additionaly found by WAF are:" + DIFF="comm -13" ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4 deleted file mode 100644 index dbc0e6dd46..0000000000 --- a/source3/Makefile-smbtorture4 +++ /dev/null @@ -1,30 +0,0 @@ -WAF_BINARY=buildtools/bin/waf -WAF=$(WAF_BINARY) -WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) -SAMBA4_BINARIES="smbtorture,ndrdump" - -samba4-configure: - @(cd .. && \ - CFLAGS='' $(WAF) reconfigure || \ - CFLAGS='' $(WAF) configure --enable-selftest --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-debug) - -.PHONY: samba4-configure - -bin/smbtorture4: $(BINARY_PREREQS) samba4-configure samba4-config-compare - cd .. && $(WAF_BUILD) --targets=smbtorture - cp ../bin/smbtorture bin/smbtorture4 - -.PHONY: bin/smbtorture4 - -bin/ndrdump4: $(BINARY_PREREQS) samba4-configure - cd .. && $(WAF_BUILD) --targets=ndrdump - cp ../bin/ndrdump bin/ndrdump4 - -.PHONY: bin/ndrdump4 - -samba4-config-compare: samba4-configure - @echo "Comparing config.h from autoconf and waf" - @echo "Configure results missing from WAF are:" - ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h - @echo "Configure results additionaly found by WAF are:" - DIFF="comm -13" ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h diff --git a/source3/Makefile.in b/source3/Makefile.in index fe98579d1e..c533929f73 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -220,7 +220,7 @@ BIN_PROGS3 = bin/smbpasswd bin/rpcclient bin/smbcacls \ bin/profiles bin/ntlm_auth bin/sharesec \ bin/smbcquotas bin/eventlogadm -TORTURE_PROGS = bin/smbtorture bin/msgtest \ +TORTURE_PROGS = bin/smbtorture3 bin/msgtest \ bin/locktest2 bin/nsstest bin/vfstest \ $(TALLOCTORT) bin/replacetort \ $(TDBTORTURE) $(PTHREADPOOLTEST) \ @@ -1602,9 +1602,9 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@ gpext_modules:: $(GPEXT_MODULES) -torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE4@ +torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE@ -smbtorture : SHOWFLAGS bin/smbtorture +smbtorture3 : SHOWFLAGS bin/smbtorture3 masktest : SHOWFLAGS bin/masktest @@ -1955,7 +1955,7 @@ bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LI @$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) -bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ) +bin/smbtorture3: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ) @echo Linking $@ @$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \ $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \ @@ -3347,13 +3347,10 @@ libnetapi_examples: libnetapi clean_libnetapi_examples: $(MAKE) -C lib/netapi/examples clean -.PHONY: bin/smbtorture4 bin/ndrdump4 +.PHONY: bin/smbtorture -bin/smbtorture4: $(BINARY_PREREQS) - $(MAKE) -f Makefile-smbtorture4 bin/smbtorture4 - -bin/ndrdump4: $(BINARY_PREREQS) - $(MAKE) -f Makefile-smbtorture4 bin/ndrdump4 +bin/smbtorture: $(BINARY_PREREQS) + $(MAKE) -f Makefile-smbtorture bin/smbtorture .PHONY: vfs_examples diff --git a/source3/configure.in b/source3/configure.in index 179d12d120..cd80571474 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -203,13 +203,13 @@ AC_ARG_WITH(profiling-data, ) dnl Checks for programs. -AC_ARG_ENABLE(smbtorture4, - [AS_HELP_STRING([--enable-smbtorture4], [Enable building smbtorture4 (default=auto)])]) +AC_ARG_ENABLE(smbtorture, + [AS_HELP_STRING([--enable-smbtorture], [Enable building smbtorture (default=auto)])]) -if test x$enable_smbtorture4 != xno; then - smbtorture4_possible=yes +if test x$enable_smbtorture != xno; then + smbtorture_possible=yes else - smbtorture4_possible=no + smbtorture_possible=no fi AC_PROG_INSTALL @@ -220,11 +220,11 @@ AC_SAMBA_GNU_MAKE([true], [true]) # Check for perl m4_include(../m4/check_perl.m4) -AC_SAMBA_PERL([true], [smbtorture4_possible=no]) +AC_SAMBA_PERL([true], [smbtorture_possible=no]) # Check for python m4_include(../m4/check_python.m4) -AC_SAMBA_PYTHON_DEVEL([true], [smbtorture4_possible=no]) +AC_SAMBA_PYTHON_DEVEL([true], [smbtorture_possible=no]) AC_CHECK_TOOL(AR, ar) @@ -1710,7 +1710,7 @@ if test x"$BLDSHARED" != x"true"; then SHLD="shared-libraries-disabled" PICFLAG="${PIE_CFLAGS}" SHLIBEXT="shared_libraries_disabled" - smbtorture4_possible=no + smbtorture_possible=no fi AC_MSG_CHECKING([used PICFLAG]) @@ -6519,9 +6519,9 @@ fi m4_include(../lib/zlib/zlib.m4) -if test x$smbtorture4_possible = xyes; then - SMBTORTURE4="bin/smbtorture4" - AC_SUBST(SMBTORTURE4) +if test x$smbtorture_possible = xyes; then + SMBTORTURE="bin/smbtorture" + AC_SUBST(SMBTORTURE) fi AC_SUBST(ZLIB_LIBS) 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 \ -- cgit