Bug#622699: gcc-4.6: Please enable sh4 in libstdc++-no-testsuite.diff

[Nobuhiro Iwamatsu <iwamatsu@debian.org>]

Package: gcc-4.6
Version: 4.6.0-2
Severity: wishlist
Tags: patch

Hi,

sh4 needs much time in a test of gcc.
It is a test of libstdc++ to spend much time in that (about 28 hour).
I want to disable sh4's test of libstdc++ in the same way as arm
and mipsel.

Please enable sh4 in libstdc++-no-testsuite.diff.

I attached 2 patch in this mail.
- libstdc++-no-testsuite_sh4_gcc4.6.patch
  This patch fix this bug.
- libstdc++-no-testsuite_cleanup_gcc4.6.patch
  This patch cleanup and drop hppa from
  patches/libstdc++-no-testsuite.diff,
  because this does not use in debian/rules.patch.
  Currently, this is enable in arm, mipsel and sh4.

Best regards,
  Nobuhiro

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.37-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

diff --git a/debian/patches/libstdc++-no-testsuite.diff b/debian/patches/libstdc++-no-testsuite.diff
index 572a03b..af95331 100644
--- a/debian/patches/libstdc++-no-testsuite.diff
+++ b/debian/patches/libstdc++-no-testsuite.diff
@@ -1,5 +1,5 @@
 ## DP: Don't run the libstdc++ testsuite on arm and ia64 (timeouts on the buildds)
-# DP: Don't run the libstdc++ testsuite on hppa and mipsel (timeouts on the buildds)
+# DP: Don't run the libstdc++ testsuite on hppa, mipsel and sh4 (timeouts on the buildds)
 
 --- a/src/libstdc++-v3/testsuite/Makefile.in~	2010-02-23 02:43:51.522335339 +0100
 +++ b/src/libstdc++-v3/testsuite/Makefile.in	2010-02-23 08:34:41.691086441 +0100
@@ -7,7 +7,7 @@
  
  # Run the testsuite in normal mode.
  check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
-+	case "$(target)" in arm*|hppa*|mipsel*) exit 0;; esac; \
++	case "$(target)" in arm*|hppa*|mipsel*|sh4*) exit 0;; esac; \
  	AR="$(AR)"; export AR; \
  	RANLIB="$(RANLIB)"; export RANLIB; \
  	if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
diff --git a/debian/rules.patch b/debian/rules.patch
index dd49455..93d6c03 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -195,7 +195,7 @@ endif
 debian_patches += libjava-disable-static libjava-fixed-symlinks
 debian_patches += libstdc++-arm-wno-abi
 
-ifneq (,$(filter $(DEB_TARGET_ARCH), armel mipsel))
+ifneq (,$(filter $(DEB_TARGET_ARCH), armel mipsel sh4))
   # timeouts on the buildd's, both Debian and Ubuntu
   debian_patches += libstdc++-no-testsuite
 endif

diff --git a/debian/patches/libstdc++-no-testsuite.diff b/debian/patches/libstdc++-no-testsuite.diff
index af95331..550dece 100644
--- a/debian/patches/libstdc++-no-testsuite.diff
+++ b/debian/patches/libstdc++-no-testsuite.diff
@@ -1,5 +1,4 @@
-## DP: Don't run the libstdc++ testsuite on arm and ia64 (timeouts on the buildds)
-# DP: Don't run the libstdc++ testsuite on hppa, mipsel and sh4 (timeouts on the buildds)
+# DP: Don't run the libstdc++ testsuite on arm, mipsel and sh4 (timeouts on the buildds)
 
 --- a/src/libstdc++-v3/testsuite/Makefile.in~	2010-02-23 02:43:51.522335339 +0100
 +++ b/src/libstdc++-v3/testsuite/Makefile.in	2010-02-23 08:34:41.691086441 +0100
@@ -7,7 +6,7 @@
  
  # Run the testsuite in normal mode.
  check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
-+	case "$(target)" in arm*|hppa*|mipsel*|sh4*) exit 0;; esac; \
++	case "$(target)" in arm*|mipsel*|sh4*) exit 0;; esac; \
  	AR="$(AR)"; export AR; \
  	RANLIB="$(RANLIB)"; export RANLIB; \
  	if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \