Merged in techtonik/scons (pull request #63: Another minor cleanup as the code study goes on)

4 files changed, 7 insertions, 17 deletions

diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index e250486..b7576af 100644
--- a/test/GetBuildFailures/parallel.py
+++ b/test/GetBuildFailures/parallel.py
@@ -82,13 +82,8 @@ def print_build_failures():
     for bf in sorted(GetBuildFailures(), key=lambda t: t.filename):
         print "%%s failed:  %%s" %% (bf.node, bf.errstr)
 
-try:
-    import atexit
-except ImportError:
-    import sys
-    sys.exitfunc = print_build_failures
-else:
-    atexit.register(print_build_failures)
+import atexit
+atexit.register(print_build_failures)
 """ % locals())
 
 test.write('f3.in', "f3.in\n")
diff --git a/test/GetBuildFailures/serial.py b/test/GetBuildFailures/serial.py
index 752b348..9c56bb1 100644
--- a/test/GetBuildFailures/serial.py
+++ b/test/GetBuildFailures/serial.py
@@ -95,13 +95,8 @@ def print_build_failures():
         if bf.command:
             print "BF:    %%s" %% " ".join(Flatten(bf.command))
 
-try:
-    import atexit
-except ImportError:
-    import sys
-    sys.exitfunc = print_build_failures
-else:
-    atexit.register(print_build_failures)
+import atexit
+atexit.register(print_build_failures)
 """ % locals())
 
 test.write('f03.in', "f03.in\n")
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index eb33223..cea2f11 100644
--- a/test/runtest/noqmtest.py
+++ b/test/runtest/noqmtest.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Test that the --noqmtest option invokes tests directly via Python, not
+Test that by default tests are invoked directly via Python, not
 using qmtest.
 """
 
@@ -74,7 +74,7 @@ testlist = [
     test_pass_py,
 ]
 
-test.run(arguments = '-k --noqmtest %s' % ' '.join(testlist),
+test.run(arguments = '-k %s' % ' '.join(testlist),
          status = 1,
          stdout = expect_stdout,
          stderr = expect_stderr)
diff --git a/test/runtest/xml/output.py b/test/runtest/xml/output.py
index 4702b7e..66d7911 100644
--- a/test/runtest/xml/output.py
+++ b/test/runtest/xml/output.py
@@ -52,7 +52,7 @@ test.write_no_result_test(['test', 'no_result.py'])
 
 test.write_passing_test(['test', 'pass.py'])
 
-test.run(arguments = '-o xml.out --xml test', status=1)
+test.run(arguments = '--xml xml.out test', status=1)
 
 expect = """\
   <results>