6 files changed, 19 insertions, 10 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 5f2b958..9269678 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -1062,7 +1062,7 @@ print py_ver
             restore_sconsflags(sconsflags)
         return p
 
-    def wait_for(self, fname, timeout=10.0, popen=None):
+    def wait_for(self, fname, timeout=20.0, popen=None):
         """
         Waits for the specified file name to exist.
         """
@@ -1072,8 +1072,17 @@ print py_ver
                 sys.stderr.write('timed out waiting for %s to exist\n' % fname)
                 if popen:
                     popen.stdin.close()
+                    popen.stdin = None
                     self.status = 1
                     self.finish(popen)
+                stdout = self.stdout()
+                if stdout:
+                    sys.stdout.write(self.banner('STDOUT ') + '\n')
+                    sys.stdout.write(stdout)
+                stderr = self.stderr()
+                if stderr:
+                    sys.stderr.write(self.banner('STDERR ') + '\n')
+                    sys.stderr.write(stderr)
                 self.fail_test()
             time.sleep(1.0)
             waited = waited + 1.0
diff --git a/test/Fortran/SHF77FLAGS.py b/test/Fortran/SHF77FLAGS.py
index 7d55a91..644b827 100644
--- a/test/Fortran/SHF77FLAGS.py
+++ b/test/Fortran/SHF77FLAGS.py
@@ -38,11 +38,11 @@ test = TestSCons.TestSCons()
 test.write('myg77.py', r"""
 import getopt
 import sys
-opts, args = getopt.getopt(sys.argv[1:], 'cf:o:x')
+opts, args = getopt.getopt(sys.argv[1:], 'cf:K:o:x')
 optstring = ''
 for opt, arg in opts:
     if opt == '-o': out = arg
-    elif opt != '-f': optstring = optstring + ' ' + opt
+    elif opt not in ('-f', '-K'): optstring = optstring + ' ' + opt
 infile = open(args[0], 'rb')
 outfile = open(out, 'wb')
 outfile.write(optstring + "\n")
diff --git a/test/Fortran/SHF90FLAGS.py b/test/Fortran/SHF90FLAGS.py
index 7ff3a43..d5066c6 100644
--- a/test/Fortran/SHF90FLAGS.py
+++ b/test/Fortran/SHF90FLAGS.py
@@ -39,11 +39,11 @@ test.write('myfortran.py', r"""
 import getopt
 import sys
 comment = '#' + sys.argv[1]
-opts, args = getopt.getopt(sys.argv[2:], 'cf:o:xy')
+opts, args = getopt.getopt(sys.argv[2:], 'cf:K:o:xy')
 optstring = ''
 for opt, arg in opts:
     if opt == '-o': out = arg
-    elif opt != '-f': optstring = optstring + ' ' + opt
+    elif opt not in ('-f', '-K'): optstring = optstring + ' ' + opt
 infile = open(args[0], 'rb')
 outfile = open(out, 'wb')
 outfile.write(optstring + "\n")
diff --git a/test/Fortran/SHF95FLAGS.py b/test/Fortran/SHF95FLAGS.py
index b809d22..b945bac 100644
--- a/test/Fortran/SHF95FLAGS.py
+++ b/test/Fortran/SHF95FLAGS.py
@@ -39,11 +39,11 @@ test.write('myfortran.py', r"""
 import getopt
 import sys
 comment = '#' + sys.argv[1]
-opts, args = getopt.getopt(sys.argv[2:], 'cf:o:xy')
+opts, args = getopt.getopt(sys.argv[2:], 'cf:K:o:xy')
 optstring = ''
 for opt, arg in opts:
     if opt == '-o': out = arg
-    elif opt != '-f': optstring = optstring + ' ' + opt
+    elif opt not in ('-f', '-K'): optstring = optstring + ' ' + opt
 infile = open(args[0], 'rb')
 outfile = open(out, 'wb')
 outfile.write(optstring + "\n")
diff --git a/test/Fortran/SHFORTRANFLAGS.py b/test/Fortran/SHFORTRANFLAGS.py
index 65f6a6c..11116f4 100644
--- a/test/Fortran/SHFORTRANFLAGS.py
+++ b/test/Fortran/SHFORTRANFLAGS.py
@@ -37,11 +37,11 @@ test = TestSCons.TestSCons()
 test.write('myfortran.py', r"""
 import getopt
 import sys
-opts, args = getopt.getopt(sys.argv[1:], 'cf:o:x')
+opts, args = getopt.getopt(sys.argv[1:], 'cf:K:o:x')
 optstring = ''
 for opt, arg in opts:
     if opt == '-o': out = arg
-    elif opt != '-f': optstring = optstring + ' ' + opt
+    elif opt not in ('-f', '-K'): optstring = optstring + ' ' + opt
 infile = open(args[0], 'rb')
 outfile = open(out, 'wb')
 outfile.write(optstring + "\n")
diff --git a/test/packaging/tar/gz.py b/test/packaging/tar/gz.py
index 052adc2..f841c59 100644
--- a/test/packaging/tar/gz.py
+++ b/test/packaging/tar/gz.py
@@ -45,7 +45,7 @@ int main( int argc, char* argv[] )
 {
   return 0;
 }
-  """)
+""")
 
   test.write('SConstruct', """
 Program( 'src/main.c' )