r3080 - in glibc-package/branches/glibc-2.8/debian: rules.d sysdeps
Author: aurel32
Date: 2008-08-10 19:52:39 +0000 (Sun, 10 Aug 2008)
New Revision: 3080
Modified:
glibc-package/branches/glibc-2.8/debian/rules.d/build.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
Log:
Multiply the timeoutfactor by 5 on all targets, some more adjustements
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-10 19:51:46 UTC (rev 3079)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-10 19:52:39 UTC (rev 3080)
@@ -108,7 +108,7 @@
else \
echo Testing $(curpass); \
find $(DEB_BUILDDIR) -name '*.out' -exec rm {} ';' ; \
- TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$$(($(TIMEOUTFACTOR)*5))" $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) -k check 2>&1 | tee -a $(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/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/mips.mk 2008-08-10 19:51:46 UTC (rev 3079)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/mips.mk 2008-08-10 19:52:39 UTC (rev 3080)
@@ -1,5 +1,8 @@
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
@@ -30,6 +33,3 @@
define mipsn32_extra_install
cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
endef
-
-# Some tests assume a fast machine
-TIMEOUTFACTOR=3
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk 2008-08-10 19:51:46 UTC (rev 3079)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/mipsel.mk 2008-08-10 19:52:39 UTC (rev 3080)
@@ -1,5 +1,8 @@
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
@@ -30,6 +33,3 @@
define mipsn32_extra_install
cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
endef
-
-# Some tests assume a fast machine
-TIMEOUTFACTOR=3
Modified: glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk 2008-08-10 19:51:46 UTC (rev 3079)
+++ glibc-package/branches/glibc-2.8/debian/sysdeps/powerpc.mk 2008-08-10 19:52:39 UTC (rev 3080)
@@ -1,5 +1,5 @@
# Some tests assume a fast machine
-TIMEOUTFACTOR=4
+TIMEOUTFACTOR=2
# build 64-bit (ppc64) alternative library
GLIBC_PASSES += ppc64
Reply to: