diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2009-09-10 20:36:19 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2009-09-10 20:36:19 +0000 |
| commit | 1382ae05e3d1f105433b8244e937aa7c395c6904 (patch) | |
| tree | 14d5da9ce06802886645fb906000da34f18fed6e /gcc | |
| parent | 0e6748ab2c1323ff7352035eb1abf3530cff8fff (diff) | |
| download | gcc-1382ae05e3d1f105433b8244e937aa7c395c6904.zip gcc-1382ae05e3d1f105433b8244e937aa7c395c6904.tar.gz gcc-1382ae05e3d1f105433b8244e937aa7c395c6904.tar.bz2 | |
gcc/testsuite:
PR ada/18302
* ada/acats/run_all.sh (target_run): Use run_test.exp to execute
commands.
* ada/acats/run_test.exp: New file.
gcc/ada:
PR ada/18302
* gcc-interface/Make-lang.in (check-acats): Export rootme, EXPECT.
Co-Authored-By: James A. Morrison <phython@gcc.gnu.org>
From-SVN: r151614
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_all.sh | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ada/acats/run_test.exp | 13 |
5 files changed, 29 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 9ebc3d2..9ef2feb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2009-09-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR ada/18302 + * gcc-interface/Make-lang.in (check-acats): Export rootme, EXPECT. + 2009-09-08 Eric Botcazou <ebotcazou@adacore.com> * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Subtype>: Tidy diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 86707e0..d0eb5e8 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -841,6 +841,8 @@ check_acats_targets = $(patsubst %,check-acats%, 0 1 2) check-acats: @test -d $(ACATSDIR) || mkdir -p $(ACATSDIR); \ + rootme=`${PWD_COMMAND}`; export rootme; \ + EXPECT=$(EXPECT); export EXPECT; \ if [ -z "$(CHAPTERS)" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; \ then \ $(MAKE) $(check_acats_targets); \ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 03271ae..3a6e97a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2009-09-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + James A. Morrison <phython@gcc.gnu.org> + + PR ada/18302 + * ada/acats/run_all.sh (target_run): Use run_test.exp to execute + commands. + * ada/acats/run_test.exp: New file. + 2009-09-10 Uros Bizjak <ubizjak@gmail.com> Revert: diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh index ddd4da0..e28ec7a 100755 --- a/gcc/testsuite/ada/acats/run_all.sh +++ b/gcc/testsuite/ada/acats/run_all.sh @@ -13,7 +13,7 @@ gccflags="-O2" gnatflags="-gnatws" target_run () { -$* + eval $EXPECT -f $testdir/run_test.exp $* } # End of customization section. diff --git a/gcc/testsuite/ada/acats/run_test.exp b/gcc/testsuite/ada/acats/run_test.exp new file mode 100644 index 0000000..07dec27 --- /dev/null +++ b/gcc/testsuite/ada/acats/run_test.exp @@ -0,0 +1,13 @@ +#!/usr/bin/expect -f + +if {[info exists env(DEJAGNU_TIMEOUT)]} { + set timeout $env(DEJAGNU_TIMEOUT) +} else { + set timeout 300 +} + +spawn -noecho $argv +expect timeout { + send_user "Program timed out.\n" + exit 1 +} |