Win32 portability fixes for various tests.

1 files changed, 7 insertions, 36 deletions

diff --git a/test/F77FLAGS.py b/test/F77FLAGS.py
index e4d1f8c..79469c4 100644
--- a/test/F77FLAGS.py
+++ b/test/F77FLAGS.py
@@ -38,8 +38,6 @@ if sys.platform == 'win32':
 
     _exe = '.exe'
 
-    o = ' -x /c'
-
     test.write('mylink.py', r"""
 import string
 import sys
@@ -58,37 +56,10 @@ for l in infile.readlines():
 sys.exit(0)
 """)
 
-    test.write('myg77.py', r"""
-import sys
-args = sys.argv[1:]
-inf = None
-optstring = ''
-while args:
-    a = args[0]
-    args = args[1:]
-    if not a[0] in '/-':
-        if not inf:
-            inf = a
-        continue
-    if a[:3] == '/Fo':
-        out = a[3:]
-        continue
-    optstring = optstring + ' ' + a
-infile = open(inf, 'rb')
-outfile = open(out, 'wb')
-outfile.write(optstring + "\n")
-for l in infile.readlines():
-    if l[:4] != '#g77':
-	outfile.write(l)
-sys.exit(0)
-""")
-
 else:
 
     _exe = ''
 
-    o = ' -x -c'
-
     test.write('mylink.py', r"""
 import getopt
 import sys
@@ -103,7 +74,7 @@ for l in infile.readlines():
 sys.exit(0)
 """)
 
-    test.write('myg77.py', r"""
+test.write('myg77.py', r"""
 import getopt
 import sys
 opts, args = getopt.getopt(sys.argv[1:], 'co:x')
@@ -165,17 +136,17 @@ test.write('test6.FPP', r"""This is a .FPP file.
 
 test.run(arguments = '.', stderr = None)
 
-test.fail_test(test.read('test1' + _exe) != "%s\nThis is a .f file.\n" % o)
+test.fail_test(test.read('test1' + _exe) != " -x -c\nThis is a .f file.\n")
 
-test.fail_test(test.read('test2' + _exe) != "%s\nThis is a .for file.\n" % o)
+test.fail_test(test.read('test2' + _exe) != " -x -c\nThis is a .for file.\n")
 
-test.fail_test(test.read('test3' + _exe) != "%s\nThis is a .FOR file.\n" % o)
+test.fail_test(test.read('test3' + _exe) != " -x -c\nThis is a .FOR file.\n")
 
-test.fail_test(test.read('test4' + _exe) != "%s\nThis is a .F file.\n" % o)
+test.fail_test(test.read('test4' + _exe) != " -x -c\nThis is a .F file.\n")
 
-test.fail_test(test.read('test5' + _exe) != "%s\nThis is a .fpp file.\n" % o)
+test.fail_test(test.read('test5' + _exe) != " -x -c\nThis is a .fpp file.\n")
 
-test.fail_test(test.read('test6' + _exe) != "%s\nThis is a .FPP file.\n" % o)
+test.fail_test(test.read('test6' + _exe) != " -x -c\nThis is a .FPP file.\n")