diff options
| author | dirkbaechle <devnull@localhost> | 2012-08-09 21:56:44 (GMT) |
|---|---|---|
| committer | dirkbaechle <devnull@localhost> | 2012-08-09 21:56:44 (GMT) |
| commit | 780d9ca6577e5a15b4d4cfad111b74132c255be1 (patch) | |
| tree | 5696b9fa594e2b3a56161afede1ebcd92ee5c1e0 /test/runtest/simple | |
| parent | 1fea3bfcaf2ee4cbb7498426bac6b83e6c4bc1d9 (diff) | |
| download | SCons-780d9ca6577e5a15b4d4cfad111b74132c255be1.zip SCons-780d9ca6577e5a15b4d4cfad111b74132c255be1.tar.gz SCons-780d9ca6577e5a15b4d4cfad111b74132c255be1.tar.bz2 | |
- 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)
Diffstat (limited to 'test/runtest/simple')
| -rw-r--r-- | test/runtest/simple/combined.py | 2 | ||||
| -rw-r--r-- | test/runtest/simple/fail.py | 2 | ||||
| -rw-r--r-- | test/runtest/simple/no_result.py | 2 | ||||
| -rw-r--r-- | test/runtest/simple/pass.py | 2 |
4 files changed, 4 insertions, 4 deletions
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() |