r972 - in glibc-package/trunk/debian: . rules.d sysdeps
Author: gotom
Date: 2005-07-28 02:24:48 +0000 (Thu, 28 Jul 2005)
New Revision: 972
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/sysdeps/alpha.mk
glibc-package/trunk/debian/sysdeps/hppa.mk
Log:
* Introduce RUN_TESTSUITE for disabling make check, taken from Jeff
Bailey <jbailey@ubuntu.com>:
- debian/rules: Enable RUN_TESTSUITE in default.
- debian/rules.d/build.mk: Check RUN_TESTSUITE before invoking tests.
- debian/sysdeps/hppa.mk: Disable RUN_TESTSUITE because linuxthreads
cannot work correctly.
- debian/sysdeps/alpha.mk: Likewise.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-07-28 02:18:43 UTC (rev 971)
+++ glibc-package/trunk/debian/changelog 2005-07-28 02:24:48 UTC (rev 972)
@@ -23,6 +23,14 @@
- debian/sysdeps/m68k.mk: New file, to use gcc-3.4 as CC and BUILD_CC
due to gcc-4.0 ICE. See #319312.
+ * Introduce RUN_TESTSUITE for disabling make check, taken from Jeff
+ Bailey <jbailey@ubuntu.com>:
+ - debian/rules: Enable RUN_TESTSUITE in default.
+ - debian/rules.d/build.mk: Check RUN_TESTSUITE before invoking tests.
+ - debian/sysdeps/hppa.mk: Disable RUN_TESTSUITE because linuxthreads
+ cannot work correctly.
+ - debian/sysdeps/alpha.mk: Likewise.
+
* debian/sysdeps/depflags.pl: Drop Depends: libdb1-compat because it's
until sarge stuff. Suggested by Colin Watson <cjwatson@debian.org>.
(Closes: #318885)
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2005-07-28 02:18:43 UTC (rev 971)
+++ glibc-package/trunk/debian/rules 2005-07-28 02:24:48 UTC (rev 972)
@@ -83,6 +83,8 @@
BUILD_CC = gcc-4.0
+RUN_TESTSUITE = yes
+
# Set CC for cross-compiling
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
CC = $(DEB_HOST_GNU_TYPE)-gcc
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2005-07-28 02:18:43 UTC (rev 971)
+++ glibc-package/trunk/debian/rules.d/build.mk 2005-07-28 02:24:48 UTC (rev 972)
@@ -67,6 +67,8 @@
echo "Cross compiling, skipping tests."; \
elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
echo "Kernel too old, skipping tests."; \
+ elif [ $(call xx,RUN_TESTSUITE) != "yes" ]; then \
+ echo "Testsuite disabled for $(curpass), skipping tests."; \
else \
echo Testing $(curpass); \
$(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) -k check 2>&1 | tee -a $(log_test); \
Modified: glibc-package/trunk/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/alpha.mk 2005-07-28 02:18:43 UTC (rev 971)
+++ glibc-package/trunk/debian/sysdeps/alpha.mk 2005-07-28 02:24:48 UTC (rev 972)
@@ -1 +1,5 @@
libc = libc6.1
+
+# disabled because alpha linuxthreads ex7, ex9, ex10, ex18 stopps eternally
+# even if TIMEOUTSCALE is set - SIGALRM from the program is just ignored.
+RUN_TESTSUITE = no
Modified: glibc-package/trunk/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hppa.mk 2005-07-28 02:18:43 UTC (rev 971)
+++ glibc-package/trunk/debian/sysdeps/hppa.mk 2005-07-28 02:24:48 UTC (rev 972)
@@ -6,3 +6,8 @@
mkdir -p debian/$(curpass)/usr/hppa64-linux
ln -sf /usr/include debian/$(curpass)/usr/hppa64-linux/include
endef
+
+# some hppa linuxthreads tests: ex* do not work currently even if
+# TIMEOUTSCALE is set - SIGALRM from the program is just ignored.
+RUN_TESTSUITE = no
+
Reply to: