summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-07-29 22:44:51 (GMT)
committerSteven Knight <knight@baldmt.com>2004-07-29 22:44:51 (GMT)
commitb2a820a2b535f0eeeb0e3074cbc32355ab54db4f (patch)
tree0d54ec64628db8b17af57f806491a53e894929e1 /test
parente461d8cf6bd1d3b9e00fea118066ef528c62aff0 (diff)
downloadSCons-b2a820a2b535f0eeeb0e3074cbc32355ab54db4f.zip
SCons-b2a820a2b535f0eeeb0e3074cbc32355ab54db4f.tar.gz
SCons-b2a820a2b535f0eeeb0e3074cbc32355ab54db4f.tar.bz2
Add support for newer ifort versions of the Intel Fortran compiler on Linux. (Jonathan Gurley) Fortran 90 tests for future use. (Chris Murray)
Diffstat (limited to 'test')
-rw-r--r--test/Fortran/F90.py20
-rw-r--r--test/Fortran/F90FLAGS.py20
-rw-r--r--test/import.py5
3 files changed, 45 insertions, 0 deletions
diff --git a/test/Fortran/F90.py b/test/Fortran/F90.py
index 4167410..7825ae6 100644
--- a/test/Fortran/F90.py
+++ b/test/Fortran/F90.py
@@ -166,18 +166,38 @@ bar.Program(target = 'bar', source = 'bar.f')
test.write('foo.f', r"""
PROGRAM FOO
+ USE MOD_BAR
PRINT *,'foo.f'
+ CALL P
STOP
END
+ MODULE MOD_BAR
+ IMPLICIT NONE
+ CONTAINS
+ SUBROUTINE P
+ PRINT *,'mod_bar'
+ END SUBROUTINE P
+ END MODULE MOD_BAR
""")
test.write('bar.f', r"""
PROGRAM BAR
+ USE MOD_FOO
PRINT *,'bar.f'
+ CALL P
STOP
END
""")
+ test.write('foo_mod.f', r"""
+ MODULE MOD_FOO
+ IMPLICIT NONE
+ CONTAINS
+ SUBROUTINE P
+ PRINT *,'mod_foo'
+ END SUBROUTINE P
+ END MODULE MOD_FOO
+""")
test.run(arguments = 'foo' + _exe, stderr = None)
diff --git a/test/Fortran/F90FLAGS.py b/test/Fortran/F90FLAGS.py
index f598986..375df71 100644
--- a/test/Fortran/F90FLAGS.py
+++ b/test/Fortran/F90FLAGS.py
@@ -170,18 +170,38 @@ bar.Program(target = 'bar', source = 'bar.f')
test.write('foo.f', r"""
PROGRAM FOO
+ USE MOD_BAR
PRINT *,'foo.f'
+ CALL P
STOP
END
+ MODULE MOD_BAR
+ IMPLICIT NONE
+ CONTAINS
+ SUBROUTINE P
+ PRINT *,'mod_bar'
+ END SUBROUTINE P
+ END MODULE MOD_BAR
""")
test.write('bar.f', r"""
PROGRAM BAR
+ USE MOD_FOO
PRINT *,'bar.f'
+ CALL P
STOP
END
""")
+ test.write('foo_mod.f', r"""
+ MODULE MOD_FOO
+ IMPLICIT NONE
+ CONTAINS
+ SUBROUTINE P
+ PRINT *,'mod_foo'
+ END SUBROUTINE P
+ END MODULE MOD_FOO
+""")
test.run(arguments = 'foo' + _exe, stderr = None)
diff --git a/test/import.py b/test/import.py
index e7e21f1..071e198 100644
--- a/test/import.py
+++ b/test/import.py
@@ -55,12 +55,16 @@ tools = [
'BitKeeper',
'c++',
'cc',
+ 'cvf',
'CVS',
'default',
'dmd',
'dvipdf',
'dvips',
'f77',
+ 'f90',
+ 'f95',
+ 'fortran',
'g++',
'g77',
'gas',
@@ -72,6 +76,7 @@ tools = [
'hplink',
'icc',
'icl',
+ 'ifort',
'ifl',
'ilink',
'ilink32',