diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2005-11-18 21:09:05 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2005-11-18 21:09:05 +0000 |
| commit | 4c63a5845dc7482b2ae0f7e0424b5e4507dd39be (patch) | |
| tree | 17e74e26601511aa06d2b73b3fa95585c2042922 /gcc | |
| parent | a6a5de042872e3892f20225d1e5a10ca7bc2c990 (diff) | |
| download | gcc-4c63a5845dc7482b2ae0f7e0424b5e4507dd39be.zip gcc-4c63a5845dc7482b2ae0f7e0424b5e4507dd39be.tar.gz gcc-4c63a5845dc7482b2ae0f7e0424b5e4507dd39be.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -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 96230fc..002b28b 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 caaf56b..402ff69 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. |