re PR testsuite/32547 (gnat.dg tasking tests fail on IRIX 5.3)

	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.

From-SVN: r157037

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a09c2730964936594aeef387d3f717f3c7baa1be..b69f2f6cb82dc2edc8419f3c2a02db6d7d4491ad 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats
index 4ae25faef194595fd619fc6dfad23cc6aaa8de0f..3c3d89908f667cb3b5670e2edd4acb1062798f8e 100755 (executable)
--- 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 a5e1c13a5e6aebb0a739b117d9ebdc342ebe2575..edc76f4371d4e615c9ca3a16812392055c2cfd58 100755 (executable)
--- 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 8ed6d810400718b24648bcdc81000ee346bfc35a..217605e2e5454a6e207be77bafdc39f059499780 100644 (file)
--- 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
+    }
+}