diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-02-24 12:51:44 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-02-24 12:51:44 +0000 |
| commit | 4d1f6da3eb4d8b529796a2e6d1dbd3108eb0adbb (patch) | |
| tree | 60b0b95a1b066a2ed63f5adfc7064bbb317add8b | |
| parent | 06bc1c191cb4f69745b372d00466ed6e934dd1e3 (diff) | |
| download | ppe42-gcc-4d1f6da3eb4d8b529796a2e6d1dbd3108eb0adbb.tar.gz ppe42-gcc-4d1f6da3eb4d8b529796a2e6d1dbd3108eb0adbb.zip | |
PR ada/32547
* lib/gnat-dg.exp (gnat_load): Redefine.
* ada/acats/run_acats: Run run_all.sh with $SHELL.
* ada/acats/run_all.sh: Downcase tasking not implemented message.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157037 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_acats | 2 | ||||
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_all.sh | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gnat-dg.exp | 23 |
4 files changed, 32 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a09c2730964..b69f2f6cb82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,13 @@ 2010-02-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + PR ada/32547 + * lib/gnat-dg.exp (gnat_load): Redefine. + + * ada/acats/run_acats: Run run_all.sh with $SHELL. + * ada/acats/run_all.sh: Downcase tasking not implemented message. + +2010-02-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + PR libobjc/36610 * objc/execute/forward-1.x: XFAIL on alpha*-dec-osf*, 64-bit i?86-*-solaris2*, mips-sgi-irix*, sparc*-sun-solaris2* with diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index 4ae25faef19..3c3d89908f6 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -55,4 +55,4 @@ chmod +x host_gnatmake # Limit the stack to 16MB for stack checking ulimit -s 16384 -exec $testdir/run_all.sh ${1+"$@"} +exec $SHELL $testdir/run_all.sh ${1+"$@"} diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh index a5e1c13a5e6..edc76f4371d 100755 --- a/gcc/testsuite/ada/acats/run_all.sh +++ b/gcc/testsuite/ada/acats/run_all.sh @@ -282,7 +282,7 @@ for chapter in $chapters; do cat ${i}.log >> $dir/acats.log egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1 if [ $? -ne 0 ]; then - grep 'Tasking not implemented' ${i}.log > /dev/null 2>&1 + grep 'tasking not implemented' ${i}.log > /dev/null 2>&1 if [ $? -ne 0 ]; then display "FAIL: $i" diff --git a/gcc/testsuite/lib/gnat-dg.exp b/gcc/testsuite/lib/gnat-dg.exp index 8ed6d810400..217605e2e54 100644 --- a/gcc/testsuite/lib/gnat-dg.exp +++ b/gcc/testsuite/lib/gnat-dg.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2010 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -43,3 +43,24 @@ proc gnat-dg-prune { system text } { proc gnat-dg-runtest { testcases default-extra-flags } { return [gcc-dg-runtest $testcases ${default-extra-flags}] } + +# +# gnat_load -- wrapper around default gnat_load to declare tasking tests +# unsupported on platforms that lack such support +# + +if { [info procs gnat_load] != [list] \ + && [info procs prev_gnat_load] == [list] } { + rename gnat_load prev_gnat_load + + proc gnat_load { program args } { + upvar name testcase + + set result [eval [list prev_gnat_load $program] $args] + set output [lindex $result 1] + if { [regexp "tasking not implemented" $output] } { + return [list "unsupported" $output] + } + return $result + } +} |
