run_all.sh (target_run): Revert 2005-11-17 patch.

	* ada/acats/run_all.sh (target_run): Revert 2005-11-17 patch.

From-SVN: r107190

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96230fc5207b59f3b5f5d87ddd42f985f4496b03..002b28bdb518a5ca4dbc053fe80c36201415bece 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * ada/acats/run_all.sh (target_run): Revert 2005-11-17 patch.
+
 2005-11-18  Joseph S. Myers  <joseph@codesourcery.com>
 
        * g++.dg/cpp/string-2.C: New test.

diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh
index caaf56bb550786c81e2a62dfc92100c0a593de98..402ff69cb30713102c22a27ab151d8ab48e47fc6 100755 (executable)
--- a/gcc/testsuite/ada/acats/run_all.sh
+++ b/gcc/testsuite/ada/acats/run_all.sh
@@ -12,25 +12,8 @@
 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.