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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9ebc3d22edfb61609323cea511d007bec04bd904..9ef2feb9cbeb1ec7b8af8274dce4b5093b677972 100644 (file)
--- 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 86707e0313ba570dbe358ece3d6db40e9ca7195e..d0eb5e8a9fc213b3b3ec55c9382a20bc5edcd196 100644 (file)
--- 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 03271ae82f6cfab3a960e859a7371df4209524dd..3a6e97a8ea4e204f4b0d24a152c01e06fc781fae 100644 (file)
--- 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 ddd4da0f300d279cca0444d90b56fe19f1e57cba..e28ec7a838a553afebe07ec757cb4150154bab19 100755 (executable)
--- 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 (file)
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
+}