summaryrefslogtreecommitdiffstats
path: root/test/Fortran/SHF90FLAGS.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-06-10 08:19:53 (GMT)
committerSteven Knight <knight@baldmt.com>2010-06-10 08:19:53 (GMT)
commit1dc992070b764deba45742ca3325938c6162e995 (patch)
treeb411e36b1daa61aa76395d4d11153fe6a4b693c6 /test/Fortran/SHF90FLAGS.py
parentb9bf799d4ee594f37b3a404a4e18dbee3fe56533 (diff)
downloadSCons-1dc992070b764deba45742ca3325938c6162e995.zip
SCons-1dc992070b764deba45742ca3325938c6162e995.tar.gz
SCons-1dc992070b764deba45742ca3325938c6162e995.tar.bz2
Increase the default timeout of TestSCons.wait_for() to 20.0 seconds.
(--interactive mode on our Solaris buildbot slave takes longer than 10 seconds to create the necessary marker files.) Set the stdin attribute on our popen object to None after we close it, so some versions of subprocess.py don't try to write it after it's closed. If we time out waiting for a marker file to be created, then print any stdout or stderr that's already accumulated, since that may give clues about why the test failed.
Diffstat (limited to 'test/Fortran/SHF90FLAGS.py')
-rw-r--r--test/Fortran/SHF90FLAGS.py4
1 files changed, 2 insertions, 2 deletions
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")