diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-18 21:09:05 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-18 21:09:05 +0000 |
| commit | d21eafd2f9b9daf2141d28b8bdd026dae6681613 (patch) | |
| tree | 17e74e26601511aa06d2b73b3fa95585c2042922 | |
| parent | 8901ae224084ea060696dfbe3c3be0e79c7b43e4 (diff) | |
| download | gcc-d21eafd2f9b9daf2141d28b8bdd026dae6681613.tar.gz | |
* ada/acats/run_all.sh (target_run): Revert 2005-11-17 patch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107190 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rwxr-xr-x | 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. |