r2641 - in glibc-package/branches/glibc-2.7/debian: . rules.d sysdeps
Author: aurel32
Date: 2007-11-01 14:25:41 +0000 (Thu, 01 Nov 2007)
New Revision: 2641
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/arm.mk
glibc-package/branches/glibc-2.7/debian/sysdeps/armel.mk
glibc-package/branches/glibc-2.7/debian/sysdeps/hppa.mk
Log:
* debian/rules, debian/rules.d/build.mk: allow per architecture
TIMEOUTFACTOR.
* sysdeps/arm.mk, sysdeps/armel.mk, sysdeps/hppa.mk: define
TIMEOUTFACTOR.
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-11-01 13:41:15 UTC (rev 2640)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-11-01 14:25:41 UTC (rev 2641)
@@ -70,6 +70,10 @@
* Add arm/local-args6.diff: provide DOCARGS_6 and UNDOCARGS_5 for
arm old-abi.
* 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
+ TIMEOUTFACTOR.
[ Petr Salinger]
* any/local-linuxthreads-unwind.diff: provide unwind-resume routine for
@@ -88,7 +92,7 @@
* Update patches/locale/preprocessor-collate.diff.
* Add alpha/submitted-PTR_MANGLE.diff (Closes: #448508).
- -- Pierre Habouzit <madcoder@debian.org> Thu, 01 Nov 2007 14:38:51 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 01 Nov 2007 15:24:02 +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 13:41:15 UTC (rev 2640)
+++ glibc-package/branches/glibc-2.7/debian/rules 2007-11-01 14:25:41 UTC (rev 2641)
@@ -95,6 +95,8 @@
RUN_TESTSUITE = yes
+TIMEOUT_FACTOR = 1
+
# Set CC for cross-compiling
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
CC = $(DEB_HOST_GNU_TYPE)-gcc
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 13:41:15 UTC (rev 2640)
+++ glibc-package/branches/glibc-2.7/debian/rules.d/build.mk 2007-11-01 14:25:41 UTC (rev 2641)
@@ -111,7 +111,7 @@
echo -n "Testsuite started: " | tee -a $(log_test); \
date --rfc-2822 | tee -a $(log_test); \
echo "--------------" | tee -a $(log_test); \
- $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$(call xx,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/arm.mk
===================================================================
--- glibc-package/branches/glibc-2.7/debian/sysdeps/arm.mk 2007-11-01 13:41:15 UTC (rev 2640)
+++ glibc-package/branches/glibc-2.7/debian/sysdeps/arm.mk 2007-11-01 14:25:41 UTC (rev 2641)
@@ -3,3 +3,5 @@
# We need __ARM_NR_set_tls syscall
libc_MIN_KERNEL_SUPPORTED = 2.6.12
+# Some tests assume a fast machine
+TIMEOUTFACTOR=4
Modified: glibc-package/branches/glibc-2.7/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/branches/glibc-2.7/debian/sysdeps/armel.mk 2007-11-01 13:41:15 UTC (rev 2640)
+++ glibc-package/branches/glibc-2.7/debian/sysdeps/armel.mk 2007-11-01 14:25:41 UTC (rev 2641)
@@ -3,3 +3,5 @@
# First kernel version that supports EABI
libc_MIN_KERNEL_SUPPORTED = 2.6.14
+# Some tests assume a fast machine
+TIMEOUTFACTOR=3
Modified: glibc-package/branches/glibc-2.7/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/branches/glibc-2.7/debian/sysdeps/hppa.mk 2007-11-01 13:41:15 UTC (rev 2640)
+++ glibc-package/branches/glibc-2.7/debian/sysdeps/hppa.mk 2007-11-01 14:25:41 UTC (rev 2641)
@@ -8,6 +8,9 @@
# We need LWS CAS support
libc_MIN_KERNEL_SUPPORTED = 2.6.9
+# Some tests assume a fast machine
+TIMEOUTFACTOR=2
+
# hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
# (See: Bug#239020) In future we may drop this file with supporting hppa64.
Reply to: