This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH: Timeout ACATS tests
Arnaud Charlet writes:
> > Since my Tru64 UNIX machines are not yet running again (I've recently moved
> > jobs), I couldn't test on them where several ACATS tests time out, but only
> > on sparc-sun-solaris2.11 and i386-pc-solaris2.10. Due to other breakage, I
> > didn't have a proper baseline, though. I'll try a proper regtest with my
> > recent libgfortran etc. fixes just now.
> >
> > Ok for mainline if this passes?
>
> Looks OK to me.
A proper regtest revealed one necessary change: in run_test.exp, spawn
needs to be invoked with -noecho, otherwise the command prints
spawn $argv
which interferes with some tests.
This is what I've checked in.
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
2009-09-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
James A. Morrison <phython@gcc.gnu.org>
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.
2009-09-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
gcc/ada:
PR ada/18302
* gcc-interface/Make-lang.in (check-acats): Export rootme, EXPECT.
Index: testsuite/ada/acats/run_all.sh
===================================================================
--- testsuite/ada/acats/run_all.sh (revision 151613)
+++ testsuite/ada/acats/run_all.sh (revision 151614)
@@ -13,7 +13,7 @@
gnatflags="-gnatws"
target_run () {
-$*
+ eval $EXPECT -f $testdir/run_test.exp $*
}
# End of customization section.
Index: testsuite/ada/acats/run_test.exp
===================================================================
--- testsuite/ada/acats/run_test.exp (revision 0)
+++ testsuite/ada/acats/run_test.exp (revision 151614)
@@ -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
+}
Index: ada/gcc-interface/Make-lang.in
===================================================================
--- ada/gcc-interface/Make-lang.in (revision 151613)
+++ ada/gcc-interface/Make-lang.in (revision 151614)
@@ -841,6 +841,8 @@
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); \