From 4c63a5845dc7482b2ae0f7e0424b5e4507dd39be Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 18 Nov 2005 21:09:05 +0000
Subject: [PATCH] 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
---
 gcc/testsuite/ChangeLog            |  4 ++++
 gcc/testsuite/ada/acats/run_all.sh | 19 +------------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96230fc5207..002b28bdb51 100644
--- 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 caaf56bb550..402ff69cb30 100755
--- 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.