summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-11-21 17:52:35 +1100
committerAndreas Schneider <asn@samba.org>2012-11-22 10:21:17 +0100
commit7626b5d9045c2b490b38dee7dd45ba7763740f83 (patch)
tree5baff2f323b4ce7f3c6a491dd71421fbcbfbcd7f /packaging
parent8a2ef49dea36b103a87cf2aa63417737dd754ce6 (diff)
downloadsamba-7626b5d9045c2b490b38dee7dd45ba7763740f83.tar.gz
samba-7626b5d9045c2b490b38dee7dd45ba7763740f83.tar.bz2
samba-7626b5d9045c2b490b38dee7dd45ba7763740f83.zip
build: Remove --enable-smbtorture, require bin/smbtorture (from waf) for make test
This simply moves this to being a side-effect of --enable-selftest. The flag was renamed from --enable-smbtorture4 in a recent patch. Make test now relies on smbtorture4, and so this code to make the dependency optional for the tests is not required any more. Andrew Bartlett Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/RHEL-CTDB/configure.rpm1
-rw-r--r--packaging/RHEL-CTDB/samba.spec.tmpl1
2 files changed, 0 insertions, 2 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index d0ae8b5a45..d6d7c5bdae 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -66,7 +66,6 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
--without-dnsupdate \
--with-aio-support \
--disable-merged-build \
- --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 a57269ea05..978f1a6a30 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -184,7 +184,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--without-dnsupdate \
--with-aio-support \
--disable-merged-build \
- --disable-smbtorture \
--disable-external-libtalloc \
--disable-external-libtdb