[glibc] 02/05: debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override per architecture.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.26
in repository glibc.
commit 81e86c3f3e8679ff3eeaf6c9580258eb05da1362
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Dec 31 18:14:37 2017 +0100
debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override per architecture.
---
debian/changelog | 2 ++
debian/rules | 1 +
debian/rules.d/build.mk | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index a881791..d9e67c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
before <not-errno.h>.
* debian/rules, debian/rules.d/build.mk: stop logging build/check messages
to files, both sbuild and debuild are able to do that.
+ * debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override
+ per architecture.
-- Aurelien Jarno <aurel32@debian.org> Sun, 17 Dec 2017 20:13:55 +0100
diff --git a/debian/rules b/debian/rules
index 255b759..14db9fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,7 @@ BASE_MIG = mig
DEB_GCC_VERSION ?= -7
RUN_TESTSUITE = yes
+TIMEOUTFACTOR = 25
# Set cross and native compiler names, including version.
CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie -fno-PIE
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index 92747a6..17cf910 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -124,7 +124,7 @@ $(stamp)check_%: $(stamp)build_%
echo "Testsuite disabled for $(curpass), skipping tests."; \
else \
find $(DEB_BUILDDIR) -name '*.out' -delete ; \
- LD_PRELOAD="" LANG="" TIMEOUTFACTOR="25" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) check || true ; \
+ LD_PRELOAD="" LANG="" TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) check || true ; \
if ! test -f $(DEB_BUILDDIR)/tests.sum ; then \
echo "+---------------------------------------------------------------------+" ; \
echo "| Testsuite failed to build. |" ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: