Fix handling of ${F77,F90,F95,FORTRAN}COM so they can be overridden properly.

8 files changed, 1094 insertions, 0 deletions

diff --git a/test/Fortran/F77COM.py b/test/Fortran/F77COM.py
new file mode 100644
index 0000000..53e0a31
--- /dev/null
+++ b/test/Fortran/F77COM.py
@@ -0,0 +1,177 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  F77COM = r'%s myfortran.py f77 $TARGET $SOURCES',
+                  F77PPCOM = r'%s myfortran.py f77pp $TARGET $SOURCES',
+                  FORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  FORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.Program(target = 'test01', source = 'test01.f')
+env.Program(target = 'test02', source = 'test02.F')
+env.Program(target = 'test03', source = 'test03.for')
+env.Program(target = 'test04', source = 'test04.FOR')
+env.Program(target = 'test05', source = 'test05.ftn')
+env.Program(target = 'test06', source = 'test06.FTN')
+env.Program(target = 'test07', source = 'test07.fpp')
+env.Program(target = 'test08', source = 'test08.FPP')
+env.Program(target = 'test09', source = 'test09.f77')
+env.Program(target = 'test10', source = 'test10.F77')
+env.Program(target = 'test11', source = 'test11.f90')
+env.Program(target = 'test12', source = 'test12.F90')
+env.Program(target = 'test13', source = 'test13.f95')
+env.Program(target = 'test14', source = 'test14.F95')
+env2 = Environment(LINK = r'%s mylink.py',
+                   LINKFLAGS = [],
+                   F77COM = r'%s myfortran.py f77 $TARGET $SOURCES',
+                   F77PPCOM = r'%s myfortran.py f77pp $TARGET $SOURCES')
+env2.Program(target = 'test21', source = 'test21.f')
+env2.Program(target = 'test22', source = 'test22.F')
+env2.Program(target = 'test23', source = 'test23.for')
+env2.Program(target = 'test24', source = 'test24.FOR')
+env2.Program(target = 'test25', source = 'test25.ftn')
+env2.Program(target = 'test26', source = 'test26.FTN')
+env2.Program(target = 'test27', source = 'test27.fpp')
+env2.Program(target = 'test28', source = 'test28.FPP')
+env2.Program(target = 'test29', source = 'test29.f77')
+env2.Program(target = 'test30', source = 'test30.F77')
+""" % (python, python, python, python, python, python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#link\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#link\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#link\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#link\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#link\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#link\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#link\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#link\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#link\n#f77\n")
+test.write('test10.F77', "This is a .F77 file.\n#link\n#f77pp\n")
+test.write('test11.f90', "This is a .f90 file.\n#link\n#fortran\n")
+test.write('test12.F90', "This is a .F90 file.\n#link\n#fortranpp\n")
+test.write('test13.f95', "This is a .f95 file.\n#link\n#fortran\n")
+test.write('test14.F95', "This is a .F95 file.\n#link\n#fortranpp\n")
+
+test.write('test21.f',   "This is a .f file.\n#link\n#f77\n")
+test.write('test22.F',   "This is a .F file.\n#link\n#f77pp\n")
+test.write('test23.for', "This is a .for file.\n#link\n#f77\n")
+test.write('test24.FOR', "This is a .FOR file.\n#link\n#f77pp\n")
+test.write('test25.ftn', "This is a .ftn file.\n#link\n#f77\n")
+test.write('test26.FTN', "This is a .FTN file.\n#link\n#f77pp\n")
+test.write('test27.fpp', "This is a .fpp file.\n#link\n#f77pp\n")
+test.write('test28.FPP', "This is a .FPP file.\n#link\n#f77pp\n")
+test.write('test29.f77', "This is a .f77 file.\n#link\n#f77\n")
+test.write('test30.F77', "This is a .F77 file.\n#link\n#f77pp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _exe, "This is a .f file.\n")
+test.must_match('test02' + _exe, "This is a .F file.\n")
+test.must_match('test03' + _exe, "This is a .for file.\n")
+test.must_match('test04' + _exe, "This is a .FOR file.\n")
+test.must_match('test05' + _exe, "This is a .ftn file.\n")
+test.must_match('test06' + _exe, "This is a .FTN file.\n")
+test.must_match('test07' + _exe, "This is a .fpp file.\n")
+test.must_match('test08' + _exe, "This is a .FPP file.\n")
+test.must_match('test09' + _exe, "This is a .f77 file.\n")
+test.must_match('test10' + _exe, "This is a .F77 file.\n")
+test.must_match('test11' + _exe, "This is a .f90 file.\n")
+test.must_match('test12' + _exe, "This is a .F90 file.\n")
+test.must_match('test13' + _exe, "This is a .f95 file.\n")
+test.must_match('test14' + _exe, "This is a .F95 file.\n")
+
+test.must_match('test21' + _exe, "This is a .f file.\n")
+test.must_match('test22' + _exe, "This is a .F file.\n")
+test.must_match('test23' + _exe, "This is a .for file.\n")
+test.must_match('test24' + _exe, "This is a .FOR file.\n")
+test.must_match('test25' + _exe, "This is a .ftn file.\n")
+test.must_match('test26' + _exe, "This is a .FTN file.\n")
+test.must_match('test27' + _exe, "This is a .fpp file.\n")
+test.must_match('test28' + _exe, "This is a .FPP file.\n")
+test.must_match('test29' + _exe, "This is a .f77 file.\n")
+test.must_match('test30' + _exe, "This is a .F77 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/F90COM.py b/test/Fortran/F90COM.py
new file mode 100644
index 0000000..da679a8
--- /dev/null
+++ b/test/Fortran/F90COM.py
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  F90COM = r'%s myfortran.py f90 $TARGET $SOURCES',
+                  F90PPCOM = r'%s myfortran.py f90pp $TARGET $SOURCES',
+                  FORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  FORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.Program(target = 'test01', source = 'test01.f')
+env.Program(target = 'test02', source = 'test02.F')
+env.Program(target = 'test03', source = 'test03.for')
+env.Program(target = 'test04', source = 'test04.FOR')
+env.Program(target = 'test05', source = 'test05.ftn')
+env.Program(target = 'test06', source = 'test06.FTN')
+env.Program(target = 'test07', source = 'test07.fpp')
+env.Program(target = 'test08', source = 'test08.FPP')
+env.Program(target = 'test09', source = 'test09.f77')
+env.Program(target = 'test10', source = 'test10.F77')
+env.Program(target = 'test11', source = 'test11.f90')
+env.Program(target = 'test12', source = 'test12.F90')
+env.Program(target = 'test13', source = 'test13.f95')
+env.Program(target = 'test14', source = 'test14.F95')
+env2 = Environment(LINK = r'%s mylink.py',
+                   LINKFLAGS = [],
+                   F90COM = r'%s myfortran.py f90 $TARGET $SOURCES',
+                   F90PPCOM = r'%s myfortran.py f90pp $TARGET $SOURCES')
+env2.Program(target = 'test21', source = 'test21.f90')
+env2.Program(target = 'test22', source = 'test22.F90')
+""" % (python, python, python, python, python, python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#link\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#link\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#link\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#link\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#link\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#link\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#link\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#link\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#link\n#fortran\n")
+test.write('test10.F77', "This is a .F77 file.\n#link\n#fortranpp\n")
+test.write('test11.f90', "This is a .f90 file.\n#link\n#f90\n")
+test.write('test12.F90', "This is a .F90 file.\n#link\n#f90pp\n")
+test.write('test13.f95', "This is a .f95 file.\n#link\n#fortran\n")
+test.write('test14.F95', "This is a .F95 file.\n#link\n#fortranpp\n")
+
+test.write('test21.f90', "This is a .f90 file.\n#link\n#f90\n")
+test.write('test22.F90', "This is a .F90 file.\n#link\n#f90pp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _exe, "This is a .f file.\n")
+test.must_match('test02' + _exe, "This is a .F file.\n")
+test.must_match('test03' + _exe, "This is a .for file.\n")
+test.must_match('test04' + _exe, "This is a .FOR file.\n")
+test.must_match('test05' + _exe, "This is a .ftn file.\n")
+test.must_match('test06' + _exe, "This is a .FTN file.\n")
+test.must_match('test07' + _exe, "This is a .fpp file.\n")
+test.must_match('test08' + _exe, "This is a .FPP file.\n")
+test.must_match('test09' + _exe, "This is a .f77 file.\n")
+test.must_match('test10' + _exe, "This is a .F77 file.\n")
+test.must_match('test11' + _exe, "This is a .f90 file.\n")
+test.must_match('test12' + _exe, "This is a .F90 file.\n")
+test.must_match('test13' + _exe, "This is a .f95 file.\n")
+test.must_match('test14' + _exe, "This is a .F95 file.\n")
+
+test.must_match('test21' + _exe, "This is a .f90 file.\n")
+test.must_match('test22' + _exe, "This is a .F90 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/F95COM.py b/test/Fortran/F95COM.py
new file mode 100644
index 0000000..14c03e6
--- /dev/null
+++ b/test/Fortran/F95COM.py
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  F95COM = r'%s myfortran.py f95 $TARGET $SOURCES',
+                  F95PPCOM = r'%s myfortran.py f95pp $TARGET $SOURCES',
+                  FORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  FORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.Program(target = 'test01', source = 'test01.f')
+env.Program(target = 'test02', source = 'test02.F')
+env.Program(target = 'test03', source = 'test03.for')
+env.Program(target = 'test04', source = 'test04.FOR')
+env.Program(target = 'test05', source = 'test05.ftn')
+env.Program(target = 'test06', source = 'test06.FTN')
+env.Program(target = 'test07', source = 'test07.fpp')
+env.Program(target = 'test08', source = 'test08.FPP')
+env.Program(target = 'test09', source = 'test09.f77')
+env.Program(target = 'test10', source = 'test10.F77')
+env.Program(target = 'test11', source = 'test11.f90')
+env.Program(target = 'test12', source = 'test12.F90')
+env.Program(target = 'test13', source = 'test13.f95')
+env.Program(target = 'test14', source = 'test14.F95')
+env2 = Environment(LINK = r'%s mylink.py',
+                   LINKFLAGS = [],
+                   F95COM = r'%s myfortran.py f95 $TARGET $SOURCES',
+                   F95PPCOM = r'%s myfortran.py f95pp $TARGET $SOURCES')
+env2.Program(target = 'test21', source = 'test21.f95')
+env2.Program(target = 'test22', source = 'test22.F95')
+""" % (python, python, python, python, python, python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#link\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#link\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#link\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#link\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#link\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#link\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#link\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#link\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#link\n#fortran\n")
+test.write('test10.F77', "This is a .F77 file.\n#link\n#fortranpp\n")
+test.write('test11.f90', "This is a .f90 file.\n#link\n#fortran\n")
+test.write('test12.F90', "This is a .F90 file.\n#link\n#fortranpp\n")
+test.write('test13.f95', "This is a .f95 file.\n#link\n#f95\n")
+test.write('test14.F95', "This is a .F95 file.\n#link\n#f95pp\n")
+
+test.write('test21.f95', "This is a .f95 file.\n#link\n#f95\n")
+test.write('test22.F95', "This is a .F95 file.\n#link\n#f95pp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _exe, "This is a .f file.\n")
+test.must_match('test02' + _exe, "This is a .F file.\n")
+test.must_match('test03' + _exe, "This is a .for file.\n")
+test.must_match('test04' + _exe, "This is a .FOR file.\n")
+test.must_match('test05' + _exe, "This is a .ftn file.\n")
+test.must_match('test06' + _exe, "This is a .FTN file.\n")
+test.must_match('test07' + _exe, "This is a .fpp file.\n")
+test.must_match('test08' + _exe, "This is a .FPP file.\n")
+test.must_match('test09' + _exe, "This is a .f77 file.\n")
+test.must_match('test10' + _exe, "This is a .F77 file.\n")
+test.must_match('test11' + _exe, "This is a .f90 file.\n")
+test.must_match('test12' + _exe, "This is a .F90 file.\n")
+test.must_match('test13' + _exe, "This is a .f95 file.\n")
+test.must_match('test14' + _exe, "This is a .F95 file.\n")
+
+test.must_match('test21' + _exe, "This is a .f95 file.\n")
+test.must_match('test22' + _exe, "This is a .F95 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/FORTRANCOM.py b/test/Fortran/FORTRANCOM.py
new file mode 100644
index 0000000..6fbaf8f
--- /dev/null
+++ b/test/Fortran/FORTRANCOM.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  FORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  FORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.Program(target = 'test01', source = 'test01.f')
+env.Program(target = 'test02', source = 'test02.F')
+env.Program(target = 'test03', source = 'test03.for')
+env.Program(target = 'test04', source = 'test04.FOR')
+env.Program(target = 'test05', source = 'test05.ftn')
+env.Program(target = 'test06', source = 'test06.FTN')
+env.Program(target = 'test07', source = 'test07.fpp')
+env.Program(target = 'test08', source = 'test08.FPP')
+env.Program(target = 'test09', source = 'test09.f77')
+env.Program(target = 'test10', source = 'test10.F77')
+env.Program(target = 'test11', source = 'test11.f90')
+env.Program(target = 'test12', source = 'test12.F90')
+env.Program(target = 'test13', source = 'test13.f95')
+env.Program(target = 'test14', source = 'test14.F95')
+""" % (python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#link\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#link\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#link\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#link\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#link\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#link\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#link\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#link\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#link\n#fortran\n")
+test.write('test10.F77', "This is a .F77 file.\n#link\n#fortranpp\n")
+test.write('test11.f90', "This is a .f90 file.\n#link\n#fortran\n")
+test.write('test12.F90', "This is a .F90 file.\n#link\n#fortranpp\n")
+test.write('test13.f95', "This is a .f95 file.\n#link\n#fortran\n")
+test.write('test14.F95', "This is a .F95 file.\n#link\n#fortranpp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _exe, "This is a .f file.\n")
+test.must_match('test02' + _exe, "This is a .F file.\n")
+test.must_match('test03' + _exe, "This is a .for file.\n")
+test.must_match('test04' + _exe, "This is a .FOR file.\n")
+test.must_match('test05' + _exe, "This is a .ftn file.\n")
+test.must_match('test06' + _exe, "This is a .FTN file.\n")
+test.must_match('test07' + _exe, "This is a .fpp file.\n")
+test.must_match('test08' + _exe, "This is a .FPP file.\n")
+test.must_match('test09' + _exe, "This is a .f77 file.\n")
+test.must_match('test10' + _exe, "This is a .F77 file.\n")
+test.must_match('test11' + _exe, "This is a .f90 file.\n")
+test.must_match('test12' + _exe, "This is a .F90 file.\n")
+test.must_match('test13' + _exe, "This is a .f95 file.\n")
+test.must_match('test14' + _exe, "This is a .F95 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/SHF77COM.py b/test/Fortran/SHF77COM.py
new file mode 100644
index 0000000..7501fbf
--- /dev/null
+++ b/test/Fortran/SHF77COM.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_obj   = TestSCons._shobj
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+
+
+test.write('SConstruct', """
+env = Environment(SHF77COM = r'%s myfortran.py f77 $TARGET $SOURCES',
+                  SHF77PPCOM = r'%s myfortran.py f77pp $TARGET $SOURCES',
+                  SHFORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  SHFORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.SharedObject(target = 'test01', source = 'test01.f')
+env.SharedObject(target = 'test02', source = 'test02.F')
+env.SharedObject(target = 'test03', source = 'test03.for')
+env.SharedObject(target = 'test04', source = 'test04.FOR')
+env.SharedObject(target = 'test05', source = 'test05.ftn')
+env.SharedObject(target = 'test06', source = 'test06.FTN')
+env.SharedObject(target = 'test07', source = 'test07.fpp')
+env.SharedObject(target = 'test08', source = 'test08.FPP')
+env.SharedObject(target = 'test09', source = 'test09.f77')
+env.SharedObject(target = 'test10', source = 'test10.F77')
+env.SharedObject(target = 'test11', source = 'test11.f90')
+env.SharedObject(target = 'test12', source = 'test12.F90')
+env.SharedObject(target = 'test13', source = 'test13.f95')
+env.SharedObject(target = 'test14', source = 'test14.F95')
+env2 = Environment(SHF77COM = r'%s myfortran.py f77 $TARGET $SOURCES',
+                   SHF77PPCOM = r'%s myfortran.py f77pp $TARGET $SOURCES')
+env2.SharedObject(target = 'test21', source = 'test21.f')
+env2.SharedObject(target = 'test22', source = 'test22.F')
+env2.SharedObject(target = 'test23', source = 'test23.for')
+env2.SharedObject(target = 'test24', source = 'test24.FOR')
+env2.SharedObject(target = 'test25', source = 'test25.ftn')
+env2.SharedObject(target = 'test26', source = 'test26.FTN')
+env2.SharedObject(target = 'test27', source = 'test27.fpp')
+env2.SharedObject(target = 'test28', source = 'test28.FPP')
+env2.SharedObject(target = 'test29', source = 'test29.f77')
+env2.SharedObject(target = 'test30', source = 'test30.F77')
+""" % (python, python, python, python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#f77\n")
+test.write('test10.F77', "This is a .F77 file.\n#f77pp\n")
+test.write('test11.f90', "This is a .f90 file.\n#fortran\n")
+test.write('test12.F90', "This is a .F90 file.\n#fortranpp\n")
+test.write('test13.f95', "This is a .f95 file.\n#fortran\n")
+test.write('test14.F95', "This is a .F95 file.\n#fortranpp\n")
+
+test.write('test21.f',   "This is a .f file.\n#f77\n")
+test.write('test22.F',   "This is a .F file.\n#f77pp\n")
+test.write('test23.for', "This is a .for file.\n#f77\n")
+test.write('test24.FOR', "This is a .FOR file.\n#f77pp\n")
+test.write('test25.ftn', "This is a .ftn file.\n#f77\n")
+test.write('test26.FTN', "This is a .FTN file.\n#f77pp\n")
+test.write('test27.fpp', "This is a .fpp file.\n#f77pp\n")
+test.write('test28.FPP', "This is a .FPP file.\n#f77pp\n")
+test.write('test29.f77', "This is a .f77 file.\n#f77\n")
+test.write('test30.F77', "This is a .F77 file.\n#f77pp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _obj, "This is a .f file.\n")
+test.must_match('test02' + _obj, "This is a .F file.\n")
+test.must_match('test03' + _obj, "This is a .for file.\n")
+test.must_match('test04' + _obj, "This is a .FOR file.\n")
+test.must_match('test05' + _obj, "This is a .ftn file.\n")
+test.must_match('test06' + _obj, "This is a .FTN file.\n")
+test.must_match('test07' + _obj, "This is a .fpp file.\n")
+test.must_match('test08' + _obj, "This is a .FPP file.\n")
+test.must_match('test09' + _obj, "This is a .f77 file.\n")
+test.must_match('test10' + _obj, "This is a .F77 file.\n")
+test.must_match('test11' + _obj, "This is a .f90 file.\n")
+test.must_match('test12' + _obj, "This is a .F90 file.\n")
+test.must_match('test13' + _obj, "This is a .f95 file.\n")
+test.must_match('test14' + _obj, "This is a .F95 file.\n")
+
+test.must_match('test21' + _obj, "This is a .f file.\n")
+test.must_match('test22' + _obj, "This is a .F file.\n")
+test.must_match('test23' + _obj, "This is a .for file.\n")
+test.must_match('test24' + _obj, "This is a .FOR file.\n")
+test.must_match('test25' + _obj, "This is a .ftn file.\n")
+test.must_match('test26' + _obj, "This is a .FTN file.\n")
+test.must_match('test27' + _obj, "This is a .fpp file.\n")
+test.must_match('test28' + _obj, "This is a .FPP file.\n")
+test.must_match('test29' + _obj, "This is a .f77 file.\n")
+test.must_match('test30' + _obj, "This is a .F77 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/SHF90COM.py b/test/Fortran/SHF90COM.py
new file mode 100644
index 0000000..0ff8316
--- /dev/null
+++ b/test/Fortran/SHF90COM.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_obj   = TestSCons._shobj
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+
+
+test.write('SConstruct', """
+env = Environment(SHF90COM = r'%s myfortran.py f90 $TARGET $SOURCES',
+                  SHF90PPCOM = r'%s myfortran.py f90pp $TARGET $SOURCES',
+                  SHFORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  SHFORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.SharedObject(target = 'test01', source = 'test01.f')
+env.SharedObject(target = 'test02', source = 'test02.F')
+env.SharedObject(target = 'test03', source = 'test03.for')
+env.SharedObject(target = 'test04', source = 'test04.FOR')
+env.SharedObject(target = 'test05', source = 'test05.ftn')
+env.SharedObject(target = 'test06', source = 'test06.FTN')
+env.SharedObject(target = 'test07', source = 'test07.fpp')
+env.SharedObject(target = 'test08', source = 'test08.FPP')
+env.SharedObject(target = 'test09', source = 'test09.f77')
+env.SharedObject(target = 'test10', source = 'test10.F77')
+env.SharedObject(target = 'test11', source = 'test11.f90')
+env.SharedObject(target = 'test12', source = 'test12.F90')
+env.SharedObject(target = 'test13', source = 'test13.f95')
+env.SharedObject(target = 'test14', source = 'test14.F95')
+env2 = Environment(SHF90COM = r'%s myfortran.py f90 $TARGET $SOURCES',
+                   SHF90PPCOM = r'%s myfortran.py f90pp $TARGET $SOURCES')
+env2.SharedObject(target = 'test21', source = 'test21.f90')
+env2.SharedObject(target = 'test22', source = 'test22.F90')
+""" % (python, python, python, python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#fortran\n")
+test.write('test10.F77', "This is a .F77 file.\n#fortranpp\n")
+test.write('test11.f90', "This is a .f90 file.\n#f90\n")
+test.write('test12.F90', "This is a .F90 file.\n#f90pp\n")
+test.write('test13.f95', "This is a .f95 file.\n#fortran\n")
+test.write('test14.F95', "This is a .F95 file.\n#fortranpp\n")
+
+test.write('test21.f90', "This is a .f90 file.\n#f90\n")
+test.write('test22.F90', "This is a .F90 file.\n#f90pp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _obj, "This is a .f file.\n")
+test.must_match('test02' + _obj, "This is a .F file.\n")
+test.must_match('test03' + _obj, "This is a .for file.\n")
+test.must_match('test04' + _obj, "This is a .FOR file.\n")
+test.must_match('test05' + _obj, "This is a .ftn file.\n")
+test.must_match('test06' + _obj, "This is a .FTN file.\n")
+test.must_match('test07' + _obj, "This is a .fpp file.\n")
+test.must_match('test08' + _obj, "This is a .FPP file.\n")
+test.must_match('test09' + _obj, "This is a .f77 file.\n")
+test.must_match('test10' + _obj, "This is a .F77 file.\n")
+test.must_match('test11' + _obj, "This is a .f90 file.\n")
+test.must_match('test12' + _obj, "This is a .F90 file.\n")
+test.must_match('test13' + _obj, "This is a .f95 file.\n")
+test.must_match('test14' + _obj, "This is a .F95 file.\n")
+
+test.must_match('test21' + _obj, "This is a .f90 file.\n")
+test.must_match('test22' + _obj, "This is a .F90 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/SHF95COM.py b/test/Fortran/SHF95COM.py
new file mode 100644
index 0000000..d335083
--- /dev/null
+++ b/test/Fortran/SHF95COM.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_obj   = TestSCons._shobj
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+
+
+test.write('SConstruct', """
+env = Environment(SHF95COM = r'%s myfortran.py f95 $TARGET $SOURCES',
+                  SHF95PPCOM = r'%s myfortran.py f95pp $TARGET $SOURCES',
+                  SHFORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  SHFORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.SharedObject(target = 'test01', source = 'test01.f')
+env.SharedObject(target = 'test02', source = 'test02.F')
+env.SharedObject(target = 'test03', source = 'test03.for')
+env.SharedObject(target = 'test04', source = 'test04.FOR')
+env.SharedObject(target = 'test05', source = 'test05.ftn')
+env.SharedObject(target = 'test06', source = 'test06.FTN')
+env.SharedObject(target = 'test07', source = 'test07.fpp')
+env.SharedObject(target = 'test08', source = 'test08.FPP')
+env.SharedObject(target = 'test09', source = 'test09.f77')
+env.SharedObject(target = 'test10', source = 'test10.F77')
+env.SharedObject(target = 'test11', source = 'test11.f90')
+env.SharedObject(target = 'test12', source = 'test12.F90')
+env.SharedObject(target = 'test13', source = 'test13.f95')
+env.SharedObject(target = 'test14', source = 'test14.F95')
+env2 = Environment(SHF95COM = r'%s myfortran.py f95 $TARGET $SOURCES',
+                   SHF95PPCOM = r'%s myfortran.py f95pp $TARGET $SOURCES')
+env2.SharedObject(target = 'test21', source = 'test21.f95')
+env2.SharedObject(target = 'test22', source = 'test22.F95')
+""" % (python, python, python, python, python, python))
+
+test.write('test01.f',   "This is a .f file.\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#fortran\n")
+test.write('test10.F77', "This is a .F77 file.\n#fortranpp\n")
+test.write('test11.f90', "This is a .f90 file.\n#fortran\n")
+test.write('test12.F90', "This is a .F90 file.\n#fortranpp\n")
+test.write('test13.f95', "This is a .f95 file.\n#f95\n")
+test.write('test14.F95', "This is a .F95 file.\n#f95pp\n")
+
+test.write('test21.f95', "This is a .f95 file.\n#f95\n")
+test.write('test22.F95', "This is a .F95 file.\n#f95pp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _obj, "This is a .f file.\n")
+test.must_match('test02' + _obj, "This is a .F file.\n")
+test.must_match('test03' + _obj, "This is a .for file.\n")
+test.must_match('test04' + _obj, "This is a .FOR file.\n")
+test.must_match('test05' + _obj, "This is a .ftn file.\n")
+test.must_match('test06' + _obj, "This is a .FTN file.\n")
+test.must_match('test07' + _obj, "This is a .fpp file.\n")
+test.must_match('test08' + _obj, "This is a .FPP file.\n")
+test.must_match('test09' + _obj, "This is a .f77 file.\n")
+test.must_match('test10' + _obj, "This is a .F77 file.\n")
+test.must_match('test11' + _obj, "This is a .f90 file.\n")
+test.must_match('test12' + _obj, "This is a .F90 file.\n")
+test.must_match('test13' + _obj, "This is a .f95 file.\n")
+test.must_match('test14' + _obj, "This is a .F95 file.\n")
+
+test.must_match('test21' + _obj, "This is a .f95 file.\n")
+test.must_match('test22' + _obj, "This is a .F95 file.\n")
+
+test.pass_test()
diff --git a/test/Fortran/SHFORTRANCOM.py b/test/Fortran/SHFORTRANCOM.py
new file mode 100644
index 0000000..16d38a6
--- /dev/null
+++ b/test/Fortran/SHFORTRANCOM.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_obj   = TestSCons._shobj
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myfortran.py', r"""
+import sys
+comment = '#' + sys.argv[1]
+outfile = open(sys.argv[2], 'wb')
+infile = open(sys.argv[3], 'rb')
+for l in infile.readlines():
+    if l[:len(comment)] != comment:
+	outfile.write(l)
+sys.exit(0)
+""")
+
+
+
+test.write('SConstruct', """
+env = Environment(SHFORTRANCOM = r'%s myfortran.py fortran $TARGET $SOURCES',
+                  SHFORTRANPPCOM = r'%s myfortran.py fortranpp $TARGET $SOURCES')
+env.SharedObject(target = 'test01', source = 'test01.f')
+env.SharedObject(target = 'test02', source = 'test02.F')
+env.SharedObject(target = 'test03', source = 'test03.for')
+env.SharedObject(target = 'test04', source = 'test04.FOR')
+env.SharedObject(target = 'test05', source = 'test05.ftn')
+env.SharedObject(target = 'test06', source = 'test06.FTN')
+env.SharedObject(target = 'test07', source = 'test07.fpp')
+env.SharedObject(target = 'test08', source = 'test08.FPP')
+env.SharedObject(target = 'test09', source = 'test09.f77')
+env.SharedObject(target = 'test10', source = 'test10.F77')
+env.SharedObject(target = 'test11', source = 'test11.f90')
+env.SharedObject(target = 'test12', source = 'test12.F90')
+env.SharedObject(target = 'test13', source = 'test13.f95')
+env.SharedObject(target = 'test14', source = 'test14.F95')
+""" % (python, python))
+
+test.write('test01.f',   "This is a .f file.\n#fortran\n")
+test.write('test02.F',   "This is a .F file.\n#fortranpp\n")
+test.write('test03.for', "This is a .for file.\n#fortran\n")
+test.write('test04.FOR', "This is a .FOR file.\n#fortranpp\n")
+test.write('test05.ftn', "This is a .ftn file.\n#fortran\n")
+test.write('test06.FTN', "This is a .FTN file.\n#fortranpp\n")
+test.write('test07.fpp', "This is a .fpp file.\n#fortranpp\n")
+test.write('test08.FPP', "This is a .FPP file.\n#fortranpp\n")
+test.write('test09.f77', "This is a .f77 file.\n#fortran\n")
+test.write('test10.F77', "This is a .F77 file.\n#fortranpp\n")
+test.write('test11.f90', "This is a .f90 file.\n#fortran\n")
+test.write('test12.F90', "This is a .F90 file.\n#fortranpp\n")
+test.write('test13.f95', "This is a .f95 file.\n#fortran\n")
+test.write('test14.F95', "This is a .F95 file.\n#fortranpp\n")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test01' + _obj, "This is a .f file.\n")
+test.must_match('test02' + _obj, "This is a .F file.\n")
+test.must_match('test03' + _obj, "This is a .for file.\n")
+test.must_match('test04' + _obj, "This is a .FOR file.\n")
+test.must_match('test05' + _obj, "This is a .ftn file.\n")
+test.must_match('test06' + _obj, "This is a .FTN file.\n")
+test.must_match('test07' + _obj, "This is a .fpp file.\n")
+test.must_match('test08' + _obj, "This is a .FPP file.\n")
+test.must_match('test09' + _obj, "This is a .f77 file.\n")
+test.must_match('test10' + _obj, "This is a .F77 file.\n")
+test.must_match('test11' + _obj, "This is a .f90 file.\n")
+test.must_match('test12' + _obj, "This is a .F90 file.\n")
+test.must_match('test13' + _obj, "This is a .f95 file.\n")
+test.must_match('test14' + _obj, "This is a .F95 file.\n")
+
+test.pass_test()