Author: aurel32
Date: 2008-08-14 14:54:31 +0000 (Thu, 14 Aug 2008)
New Revision: 3103
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/rules
glibc-package/branches/glibc-2.8/debian/rules.d/build.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/arm.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/armel.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/hppa.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/s390.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/sh4.mk
glibc-package/branches/glibc-2.8/debian/sysdeps/sparc.mk
Log:
* debian/rules, debian/rules.d/build.mk, debian/sysdeps.mk/*: use a common
huge TIMEOUTFACTOR for all architectures.
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-14 14:49:28 UTC
(rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-14 14:54:31 UTC
(rev 3103)
@@ -84,6 +84,9 @@
* testsuite-checking/expected-results-i686-linux-i686: new file.
* testsuite-checking/expected-results-i686-linux-xen: new file.
* testsuite-checking/expected-results-ia64-linux-gnu-libc: new file.
+ * testsuite-checking/expected-results-mipsel-linux-gnu-libc: new file.
+ * testsuite-checking/expected-results-mips64-linux-mips64: new file.
+ * testsuite-checking/expected-results-mips32-linux-mipsn32: new file.
* testsuite-checking/expected-results-powerpc-linux-gnu-libc: new file.
* testsuite-checking/expected-results-powerpc64-linux-ppc64: new file.
* testsuite-checking/expected-results-s390-linux-gnu-libc: new file.
@@ -98,6 +101,8 @@
Raphaël Hertzog. Closes: #462444.
* localedata/supported.diff: sort locales by alphabetical order. Closes:
#493231.
+ * debian/rules, debian/rules.d/build.mk, debian/sysdeps.mk/*: use a common
+ huge TIMEOUTFACTOR for all architectures.
-- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 09 Aug 2008 21:04:41 +0200
Modified: glibc-package/branches/glibc-2.8/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules 2008-08-14 14:49:28 UTC
(rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/rules 2008-08-14 14:54:31 UTC
(rev 3103)
@@ -94,8 +94,6 @@
RUN_TESTSUITE = yes
-TIMEOUTFACTOR = 1
-
# Set CC and CXX for cross-compiling
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
CC = $(DEB_HOST_GNU_TYPE)-gcc
Modified: glibc-package/branches/glibc-2.8/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -109,7 +109,7 @@
else \
echo Testing $(curpass); \
find $(DEB_BUILDDIR) -name '*.out' -exec rm {} ';' ; \
- TIMEOUTFACTOR="$$(($(TIMEOUTFACTOR)*10))" $(MAKE) -C $(DEB_BUILDDIR)
$(NJOBS) -k check 2>&1 | tee $(log_test); \
+ TIMEOUTFACTOR="50" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) -k check 2>&1
| tee $(log_test); \
chmod +x debian/testsuite-checking/convertlog.sh ; \
debian/testsuite-checking/convertlog.sh $(log_test) | tee
$(log_results) ; \
if test -f $(log_expected) ; then \
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/arm.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/arm.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -2,6 +2,3 @@
# 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.8/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/armel.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/armel.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -2,6 +2,3 @@
# 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.8/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/hppa.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/hppa.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -8,9 +8,6 @@
# 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.
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/mips.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/mips.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -1,8 +1,5 @@
libc_add-ons = ports nptl $(add-ons)
-# Some tests assume a fast machine
-TIMEOUTFACTOR=3
-
# build 32-bit (n32) alternative library
GLIBC_PASSES += mipsn32
DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -1,8 +1,5 @@
libc_add-ons = ports nptl $(add-ons)
-# Some tests assume a fast machine
-TIMEOUTFACTOR=3
-
# build 32-bit (n32) alternative library
GLIBC_PASSES += mipsn32
DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -1,6 +1,3 @@
-# Some tests assume a fast machine
-TIMEOUTFACTOR=2
-
# build 64-bit (ppc64) alternative library
GLIBC_PASSES += ppc64
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/s390.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/s390.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -1,6 +1,3 @@
-# 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
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/sh4.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/sh4.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/sh4.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -1,6 +1,3 @@
-# Some tests assume a fast machine
-TIMEOUTFACTOR=4
-
# Requires Linux 2.6.11 for NPTL
libc_MIN_KERNEL_SUPPORTED = 2.6.11
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/sparc.mk 2008-08-14
14:49:28 UTC (rev 3102)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/sparc.mk 2008-08-14
14:54:31 UTC (rev 3103)
@@ -1,6 +1,3 @@
-# Some tests assume a fast machine
-TIMEOUTFACTOR=2
-
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
