From 1382ae05e3d1f105433b8244e937aa7c395c6904 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Thu, 10 Sep 2009 20:36:19 +0000
Subject: [PATCH] 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
---
 gcc/ada/ChangeLog                    |  5 +++++
 gcc/ada/gcc-interface/Make-lang.in   |  2 ++
 gcc/testsuite/ChangeLog              |  8 ++++++++
 gcc/testsuite/ada/acats/run_all.sh   |  2 +-
 gcc/testsuite/ada/acats/run_test.exp | 13 +++++++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/ada/acats/run_test.exp

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9ebc3d22edf..9ef2feb9cbe 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 86707e0313b..d0eb5e8a9fc 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 03271ae82f6..3a6e97a8ea4 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 ddd4da0f300..e28ec7a838a 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 00000000000..07dec27709b
--- /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
+}
-- 
2.30.2