diff options
| -rwxr-xr-x | packaging/RHEL-CTDB/configure.rpm | 2 | ||||
| -rw-r--r-- | packaging/RHEL-CTDB/samba.spec.tmpl | 2 | ||||
| -rwxr-xr-x | script/autobuild.py | 4 | ||||
| -rw-r--r-- | source3/Makefile-smbtorture (renamed from source3/Makefile-smbtorture4) | 14 | ||||
| -rw-r--r-- | source3/Makefile.in | 17 | ||||
| -rw-r--r-- | source3/configure.in | 22 | ||||
| -rwxr-xr-x | source3/selftest/s3-selftest.sh | 4 |
7 files changed, 28 insertions, 37 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 4387da1072..d0ae8b5a45 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -66,7 +66,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \ --without-dnsupdate \ --with-aio-support \ --disable-merged-build \ - --disable-smbtorture4 \ + --disable-smbtorture \ --disable-external-libtalloc \ --disable-external-libtdb \ $* diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 16d2fa43cb..a57269ea05 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -184,7 +184,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --without-dnsupdate \ --with-aio-support \ --disable-merged-build \ - --disable-smbtorture4 \ + --disable-smbtorture \ --disable-external-libtalloc \ --disable-external-libtdb diff --git a/script/autobuild.py b/script/autobuild.py index efef2f4246..1182d7f070 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -39,10 +39,10 @@ tasks = { "samba3" : [ ("autogen", "./autogen.sh", "text/plain"), ("configure", "./configure.developer ${PREFIX}", "text/plain"), ("make basics", "make basics", "text/plain"), - # we split 'make -j 4', 'make bin/smbtorture4' and 'make -j 4 everything' + # we split 'make -j 4', 'make bin/smbtorture' and 'make -j 4 everything' # because it makes it much easier to find errors. ("make", "make -j 4", "text/plain"), # don't use too many processes - ("make bin/smbtorture4", "make bin/smbtorture4", "text/plain"), + ("make bin/smbtorture", "make bin/smbtorture", "text/plain"), ("make everything", "make -j 4 everything", "text/plain"), ("install", "make install", "text/plain"), ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"), diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture index dbc0e6dd46..4b5b143cfe 100644 --- a/source3/Makefile-smbtorture4 +++ b/source3/Makefile-smbtorture @@ -1,7 +1,7 @@ WAF_BINARY=buildtools/bin/waf WAF=$(WAF_BINARY) WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY) -SAMBA4_BINARIES="smbtorture,ndrdump" +SAMBA4_BINARIES="smbtorture" samba4-configure: @(cd .. && \ @@ -10,17 +10,11 @@ samba4-configure: .PHONY: samba4-configure -bin/smbtorture4: $(BINARY_PREREQS) samba4-configure samba4-config-compare +bin/smbtorture: $(BINARY_PREREQS) samba4-configure samba4-config-compare cd .. && $(WAF_BUILD) --targets=smbtorture - cp ../bin/smbtorture bin/smbtorture4 + cp ../bin/smbtorture bin/smbtorture -.PHONY: bin/smbtorture4 - -bin/ndrdump4: $(BINARY_PREREQS) samba4-configure - cd .. && $(WAF_BUILD) --targets=ndrdump - cp ../bin/ndrdump bin/ndrdump4 - -.PHONY: bin/ndrdump4 +.PHONY: bin/smbtorture samba4-config-compare: samba4-configure @echo "Comparing config.h from autoconf and waf" 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 \ |