Enabled timeout to allow hang tests to be aborted.

diff --git a/debian/changelog b/debian/changelog
index 26666cf..3dcf4a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,9 @@ ruby1.9.1 (1.9.3.125-1) unstable; urgency=low
     - Build-Depends: chrpath.
   * debian/libruby1.9.1.symbols: Added a new symbol for
     rb_str_modify_expand@Base.
-  * debian/run-test-suites.bash: Corrected options for test-all.
+  * debian/run-test-suites.bash:
+    - Corrected options for test-all.
+    - Enabled timeout to allow hang tests to be aborted.
 
  -- Daigo Moriwaki <daigo@debian.org>  Sun, 26 Feb 2012 19:25:55 +0900
 

diff --git a/debian/control b/debian/control
index 5929cad..4ba652a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: akira yamada <akira@debian.org>
 Uploaders: Daigo Moriwaki <daigo@debian.org>, Lucas Nussbaum <lucas@debian.org>
-Build-Depends: debhelper (>= 8.9.7), cdbs, quilt, patch, autoconf, m4, bison, libgdbm-dev, libncursesw5-dev, libncurses5-dev, libreadline6-dev, tcl-dev, tk-dev, zlib1g-dev, libssl-dev, procps, file, libffi-dev, ruby1.8, libyaml-dev, openssl, chrpath
+Build-Depends: debhelper (>= 8.9.7), cdbs, quilt, patch, autoconf, m4, bison, libgdbm-dev, libncursesw5-dev, libncurses5-dev, libreadline6-dev, tcl-dev, tk-dev, zlib1g-dev, libssl-dev, procps, file, libffi-dev, ruby1.8, libyaml-dev, openssl, chrpath, coreutils
 Standards-Version: 3.9.2
 Homepage: http://www.ruby-lang.org/
 Vcs-Git: git://git.debian.org/collab-maint/ruby1.9.1.git

diff --git a/debian/run-test-suites.bash b/debian/run-test-suites.bash
index 83b9655..440dcdc 100755 (executable)
--- a/debian/run-test-suites.bash
+++ b/debian/run-test-suites.bash
@@ -12,7 +12,7 @@ echo
 echo "*******************************************************************"
 echo "Running 'make test-all'"
 echo
-make TESTS=-v test-all 2>&1 |tee make-test-all.log || true
+timeout 1200 make TESTS=-v test-all 2>&1 |tee make-test-all.log || true
 echo
 echo "'make test-all' finished. checking number of failures and errors."
 echo "max number allowed: failures:$MAXFAIL errors:$MAXERR"