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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e11d55557f31b1ccdc8c8d47895db72cd212468..13bfbe9f9e6b82b25f24c05acd7a51e5f781d070 100644 (file)
--- 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 b68a05ddad6050070cdc3e422c34cb9ed903fe9d..0f68da0f41ac0ce04321518fa2c13cdecd3847d2 100644 (file)
--- 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 4a478850894586db5d865ae2b2321a80d5558883..3e28af9c4e6766f46a11cd68505b7b77ba9d2b6e 100644 (file)
--- 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.