[Pkg-samba-maint] [samba] 01/03: Revert "Run quicktest during build"

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch master
in repository samba.

commit dc234e196d4c14af78bee39d25d474b976421b3b
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Sat Jul 9 19:05:05 2016 +0000

    Revert "Run quicktest during build"
    
    This reverts commit 51d49f10880b61605ed12db0956a5f73fbc9459e.
    
    Running the selftest apparently takes very long on x32, and
    --enable-selftest causes building of the non-production ntvfs file server.
    (#830571)
---
 debian/control |  8 +-------
 debian/rules   | 10 +++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 9897a16..d6add16 100644
--- a/debian/control
+++ b/debian/control
@@ -50,13 +50,7 @@ Build-Depends: bison,
                python-testtools,
                python3,
                xsltproc,
-               zlib1g-dev (>= 1:1.2.3),
-               ldb-tools,
-               libnss-wrapper,
-               libresolv-wrapper,
-               libsocket-wrapper,
-               libuid-wrapper,
-               python-crypto
+               zlib1g-dev (>= 1:1.2.3)
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-samba/samba.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-samba/samba.git
 
diff --git a/debian/rules b/debian/rules
index 9b13673..f09e506 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,8 +70,7 @@ conf_args = \
 		--minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)" \
 		--with-cluster-support \
 		--with-socketpath=/var/run/ctdb/ctdbd.socket \
-		--with-logdir=/var/log/ctdb \
-		--enable-selftest
+		--with-logdir=/var/log/ctdb
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	conf_args += \
@@ -103,11 +102,8 @@ override_dh_auto_build:
 	DESTDIR="$(DESTDIR)" $(WAF)
 
 override_dh_auto_test:
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	make quicktest || echo 'Test failure ignored'
-else
-	@echo "** tests disabled"
-endif
+	# Running make test requires configuration with --enable-selftest, which
+	# we don't want to do for production systems.
 
 override_dh_systemd_start:
 	dh_systemd_start -pctdb --no-start --no-restart-on-upgrade

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git