- renamed the '-j' option to '-k', such that we can use the former for parallel processing later on

- changed list(map()) to list comprehensions
- removed try/except block around os.environ.get() for SCONS_EXTERNAL_TEST
- fixed a potential deadlock for subprocess.Popen by using temporary files
- added the '--nopipefiles' option to switch off this temp file fix (not recommended though)

15 files changed, 15 insertions, 15 deletions

diff --git a/test/runtest/aegis/batch-output.py b/test/runtest/aegis/batch-output.py
index e29183d..e371def 100644
--- a/test/runtest/aegis/batch-output.py
+++ b/test/runtest/aegis/batch-output.py
@@ -52,7 +52,7 @@ NO RESULT TEST STDERR
 PASSING TEST STDERR
 """
 
-test.run(arguments = '-j -o aegis.out --aegis test', stderr=expect_stderr)
+test.run(arguments = '-k -o aegis.out --aegis test', stderr=expect_stderr)
 
 expect = """\
 test_result = [
diff --git a/test/runtest/baseline/combined.py b/test/runtest/baseline/combined.py
index 1983ae0..35c1796 100644
--- a/test/runtest/baseline/combined.py
+++ b/test/runtest/baseline/combined.py
@@ -69,7 +69,7 @@ NO RESULT TEST STDERR
 PASSING TEST STDERR
 """
 
-test.run(arguments='-j -b . test',
+test.run(arguments='-k -b . test',
          status=1,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/baseline/fail.py b/test/runtest/baseline/fail.py
index a96ba80..5687160 100644
--- a/test/runtest/baseline/fail.py
+++ b/test/runtest/baseline/fail.py
@@ -47,7 +47,7 @@ expect_stderr = """\
 FAILING TEST STDERR
 """
 
-test.run(arguments='-j -b . test/fail.py',
+test.run(arguments='-k -b . test/fail.py',
          status=1,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/baseline/no_result.py b/test/runtest/baseline/no_result.py
index 7a07c01..2149594 100644
--- a/test/runtest/baseline/no_result.py
+++ b/test/runtest/baseline/no_result.py
@@ -47,7 +47,7 @@ expect_stderr = """\
 NO RESULT TEST STDERR
 """
 
-test.run(arguments='-j -b . test/no_result.py',
+test.run(arguments='-k -b . test/no_result.py',
          status=2,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/baseline/pass.py b/test/runtest/baseline/pass.py
index bcd87d7..affa486 100644
--- a/test/runtest/baseline/pass.py
+++ b/test/runtest/baseline/pass.py
@@ -50,7 +50,7 @@ expect_stderr = """\
 PASSING TEST STDERR
 """
 
-test.run(arguments='-j -b . test',
+test.run(arguments='-k -b . test',
          stdout=expect_stdout,
          stderr=expect_stderr)
 
diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py
index ae7b814..1229b28 100644
--- a/test/runtest/fallback.py
+++ b/test/runtest/fallback.py
@@ -82,7 +82,7 @@ testlist = [
     test_pass_py,
 ]
 
-test.run(arguments = '-j '+' '.join(testlist),
+test.run(arguments = '-k '+' '.join(testlist),
          status = 1,
          stdout = expect_stdout,
          stderr = expect_stderr)
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index e2cb5f8..eb33223 100644
--- a/test/runtest/noqmtest.py
+++ b/test/runtest/noqmtest.py
@@ -74,7 +74,7 @@ testlist = [
     test_pass_py,
 ]
 
-test.run(arguments = '-j --noqmtest %s' % ' '.join(testlist),
+test.run(arguments = '-k --noqmtest %s' % ' '.join(testlist),
          status = 1,
          stdout = expect_stdout,
          stderr = expect_stderr)
diff --git a/test/runtest/print_time.py b/test/runtest/print_time.py
index dfce273..244c6f8 100644
--- a/test/runtest/print_time.py
+++ b/test/runtest/print_time.py
@@ -75,7 +75,7 @@ NO RESULT TEST STDERR
 PASSING TEST STDERR
 """
 
-test.run(arguments='-j -t test',
+test.run(arguments='-k -t test',
          status=1,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/python.py b/test/runtest/python.py
index b45e8d4..d406be4 100644
--- a/test/runtest/python.py
+++ b/test/runtest/python.py
@@ -66,7 +66,7 @@ expect_stderr = """\
 PASSING TEST STDERR
 """
 
-test.run(arguments=['-j','-P', mypython, 'test'],
+test.run(arguments=['-k','-P', mypython, 'test'],
          stdout=expect_stdout,
          stderr=expect_stderr)
 
diff --git a/test/runtest/simple/combined.py b/test/runtest/simple/combined.py
index 6e0539a..616f4d5 100644
--- a/test/runtest/simple/combined.py
+++ b/test/runtest/simple/combined.py
@@ -70,7 +70,7 @@ NO RESULT TEST STDERR
 PASSING TEST STDERR
 """
 
-test.run(arguments='-j test',
+test.run(arguments='-k test',
          status=1,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/simple/fail.py b/test/runtest/simple/fail.py
index d891597..8b800fb 100644
--- a/test/runtest/simple/fail.py
+++ b/test/runtest/simple/fail.py
@@ -47,7 +47,7 @@ expect_stderr = """\
 FAILING TEST STDERR
 """
 
-test.run(arguments='-j test/fail.py',
+test.run(arguments='-k test/fail.py',
          status=1,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/simple/no_result.py b/test/runtest/simple/no_result.py
index 91ba50c..91af7e4 100644
--- a/test/runtest/simple/no_result.py
+++ b/test/runtest/simple/no_result.py
@@ -47,7 +47,7 @@ expect_stderr = """\
 NO RESULT TEST STDERR
 """
 
-test.run(arguments='-j test/no_result.py',
+test.run(arguments='-k test/no_result.py',
          status=2,
          stdout=expect_stdout,
          stderr=expect_stderr)
diff --git a/test/runtest/simple/pass.py b/test/runtest/simple/pass.py
index c954336..6e5b6b0 100644
--- a/test/runtest/simple/pass.py
+++ b/test/runtest/simple/pass.py
@@ -47,7 +47,7 @@ expect_stderr = """\
 PASSING TEST STDERR
 """
 
-test.run(arguments='-j test/pass.py', stdout=expect_stdout, stderr=expect_stderr)
+test.run(arguments='-k test/pass.py', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
 
diff --git a/test/runtest/src.py b/test/runtest/src.py
index 84b08a0..23894f9 100644
--- a/test/runtest/src.py
+++ b/test/runtest/src.py
@@ -62,7 +62,7 @@ PASSING TEST STDERR
 PASSING TEST STDERR
 """ % locals()
 
-test.run(arguments='-j src', stdout=expect_stdout, stderr=expect_stderr)
+test.run(arguments='-k src', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()
 
diff --git a/test/runtest/testlistfile.py b/test/runtest/testlistfile.py
index 5a56bb3..b86b0f2 100644
--- a/test/runtest/testlistfile.py
+++ b/test/runtest/testlistfile.py
@@ -62,7 +62,7 @@ expect_stderr = """\
 PASSING TEST STDERR
 """
 
-test.run(arguments='-j -f t.txt', stdout=expect_stdout, stderr=expect_stderr)
+test.run(arguments='-k -f t.txt', stdout=expect_stdout, stderr=expect_stderr)
 
 test.pass_test()