Author: aurel32
Date: 2007-11-01 16:11:37 +0000 (Thu, 01 Nov 2007)
New Revision: 2643
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/rules
glibc-package/branches/glibc-2.7/debian/rules.d/build.mk
glibc-package/branches/glibc-2.7/debian/sysdeps/s390.mk
Log:
Fix TIMEOUTFACTOR, add a factor for s390
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-11-01 14:27:12 UTC
(rev 2642)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-11-01 16:11:37 UTC
(rev 2643)
@@ -72,7 +72,8 @@
* Add arm/local-lowlevellock.diff: new patch to fix build on arm.
* debian/rules, debian/rules.d/build.mk: allow per architecture
TIMEOUTFACTOR.
- * sysdeps/arm.mk, sysdeps/armel.mk, sysdeps/hppa.mk: define
+ * sysdeps/arm.mk, sysdeps/armel.mk, sysdeps/hppa.mk, sysdeps/s390.mk:
+ define.
TIMEOUTFACTOR.
* locales-depver: tighten locales dependencies.
@@ -93,7 +94,7 @@
* Update patches/locale/preprocessor-collate.diff.
* Add alpha/submitted-PTR_MANGLE.diff (Closes: #448508).
- -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 01 Nov 2007 15:24:02 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 01 Nov 2007 17:11:10 +0100
glibc (2.6.1-6) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.7/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.7/debian/rules 2007-11-01 14:27:12 UTC
(rev 2642)
+++ glibc-package/branches/glibc-2.7/debian/rules 2007-11-01 16:11:37 UTC
(rev 2643)
@@ -95,7 +95,7 @@
RUN_TESTSUITE = yes
-TIMEOUT_FACTOR = 1
+TIMEOUTFACTOR = 1
# Set CC for cross-compiling
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
Modified: glibc-package/branches/glibc-2.7/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.7/debian/rules.d/build.mk 2007-11-01
14:27:12 UTC (rev 2642)
+++ glibc-package/branches/glibc-2.7/debian/rules.d/build.mk 2007-11-01
16:11:37 UTC (rev 2643)
@@ -111,7 +111,7 @@
echo -n "Testsuite started: " | tee -a $(log_test); \
date --rfc-2822 | tee -a $(log_test); \
echo "--------------" | tee -a $(log_test); \
- TIMEOUTFACTOR="$(call xx,TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR)
-j $(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) -j
$(NJOBS) -k check 2>&1 | tee -a $(log_test); \
echo "--------------" | tee -a $(log_test); \
echo -n "Testsuite ended: " | tee -a $(log_test); \
date --rfc-2822 | tee -a $(log_test); \
Modified: glibc-package/branches/glibc-2.7/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.7/debian/sysdeps/s390.mk 2007-11-01
14:27:12 UTC (rev 2642)
+++ glibc-package/branches/glibc-2.7/debian/sysdeps/s390.mk 2007-11-01
16:11:37 UTC (rev 2643)
@@ -1,3 +1,6 @@
+# Some tests assume a fast machine
+TIMEOUTFACTOR=2
+
# build 64-bit (s390x) alternative library
GLIBC_PASSES += s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
