run_all.sh (target_run): Kill long running tests.

2005-11-17  James A. Morrison  <phython@gcc.gnu.org>
            Michael Chamberlain <michael@chamberlain.net.au>

        * ada/acats/run_all.sh (target_run): Kill long running tests.

Co-Authored-By: Michael Chamberlain <michael@chamberlain.net.au>
From-SVN: r107161

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 50ada5db973dd88ae70b2aaad09ebd7cbf1565eb..9eafe7ee9cdfc90d5ab6d2ecdc904c50299fe3f2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  James A. Morrison  <phython@gcc.gnu.org>
+            Michael Chamberlain <michael@chamberlain.net.au>
+
+       * ada/acats/run_all.sh (target_run): Kill long running tests.
+
 2005-11-17  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        * gcc.dg/cleanup-8.c: Enable test on hppa*-*-hpux*.

diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh
index 402ff69cb30713102c22a27ab151d8ab48e47fc6..caaf56bb550786c81e2a62dfc92100c0a593de98 100755 (executable)
--- a/gcc/testsuite/ada/acats/run_all.sh
+++ b/gcc/testsuite/ada/acats/run_all.sh
@@ -12,8 +12,25 @@
 gccflags="-O2"
 gnatflags="-gnatws"
 
+if [ "x$DEJAGNU_TIMEOUT" != "x" ]; then
+  timeout=$DEJAGNU_TIMEOUT
+else
+  timeout=300
+fi
+
 target_run () {
-$*
+  sh -c "
+  (sleep $timeout && kill 2>/dev/null \$\$) &
+  watchdog=\$!
+  ($*) &
+  child=\$!
+  trap \"kill 2>/dev/null \$child\" 0 1
+  wait \$child
+  status=\$?
+  trap \"\" 0 1
+  kill 2>/dev/null \$watchdog
+  exit \$status
+  "
 }
 
 # End of customization section.