Python3 test fixes for Fortran/Side-effect.

1 files changed, 3 insertions, 20 deletions

diff --git a/test/Fortran/F77FLAGS.py b/test/Fortran/F77FLAGS.py
index 9b4c56c..d4e6e8a 100644
--- a/test/Fortran/F77FLAGS.py
+++ b/test/Fortran/F77FLAGS.py
@@ -24,6 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import os
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -32,30 +33,12 @@ test = TestSCons.TestSCons()
 _exe = TestSCons._exe
 
 test.file_fixture('mylink.py')
-
-test.write('myg77.py', r"""
-import getopt
-import sys
-opts, args = getopt.getopt(sys.argv[1:], 'co:x')
-optstring = ''
-for opt, arg in opts:
-    if opt == '-o': out = arg
-    else: optstring = optstring + ' ' + opt
-infile = open(args[0], 'rb')
-outfile = open(out, 'wb')
-outfile.write(optstring + "\n")
-for l in infile.readlines():
-    if l[:4] != '#g77':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-
+test.file_fixture(os.path.join('fixture', 'myfortran_flags.py'))
 
 test.write('SConstruct', """
 env = Environment(LINK = r'%(_python_)s mylink.py',
                   LINKFLAGS = [],
-                  F77 = r'%(_python_)s myg77.py',
+                  F77 = r'%(_python_)s myfortran_flags.py g77',
                   F77FLAGS = '-x')
 env.Program(target = 'test09', source = 'test09.f77')
 env.Program(target = 'test10', source = 'test10.F77')