aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanis Johnson <janis187@us.ibm.com>2006-12-15 23:31:41 +0000
committerJanis Johnson <janis@gcc.gnu.org>2006-12-15 23:31:41 +0000
commitbceed4d6712dd7319a8641e47045dbe91871b620 (patch)
treeb790102f47a93ab73de2b677ba850186b71df989
parent99e8e64971a4dbe89beb7cfbd4d4ed5dd1e0e313 (diff)
downloadgcc-bceed4d6712dd7319a8641e47045dbe91871b620.zip
gcc-bceed4d6712dd7319a8641e47045dbe91871b620.tar.gz
gcc-bceed4d6712dd7319a8641e47045dbe91871b620.tar.bz2
gfortran-dg.exp: Don't include fortran-torture.exp.
* lib/gfortran-dg.exp: Don't include fortran-torture.exp. * lib/fortran-torture.exp: Include target-supports.exp. From-SVN: r119950
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/fortran-torture.exp1
-rw-r--r--gcc/testsuite/lib/gfortran-dg.exp1
3 files changed, 6 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e11d55..13bfbe9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-15 Janis Johnson <janis187@us.ibm.com>
+
+ * lib/gfortran-dg.exp: Don't include fortran-torture.exp.
+ * lib/fortran-torture.exp: Include target-supports.exp.
+
2006-12-15 Jakub Jelinek <jakub@redhat.com>
PR target/30185
diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index b68a05d..0f68da0 100644
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -20,6 +20,7 @@
# This file was written by Steven Bosscher (s.bosscher@student.tudelft.nl)
# based on f-torture.exp, which was written by Rob Savoye.
+load_lib target-supports.exp
# The default option list can be overridden by
# TORTURE_OPTIONS="{ { list1 } ... { listN } }"
diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp
index 4a47885..3e28af9 100644
--- a/gcc/testsuite/lib/gfortran-dg.exp
+++ b/gcc/testsuite/lib/gfortran-dg.exp
@@ -14,7 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-load_lib fortran-torture.exp
load_lib gcc-dg.exp
# Define gfortran callbacks for dg.exp.