diff options
author | dirkbaechle <devnull@localhost> | 2012-08-03 23:45:05 +0200 |
---|---|---|
committer | dirkbaechle <devnull@localhost> | 2012-08-03 23:45:05 +0200 |
commit | 8bd8edd091011f8c3cfcded02e1e756dfa53b9bb (patch) | |
tree | a06aec636934dd57fc3f2d1fe48dc01f91a4f946 /test/runtest | |
parent | d2bfbf99926c79d7e4e00a69708dcdfa6f6f1356 (diff) | |
download | scons-8bd8edd091011f8c3cfcded02e1e756dfa53b9bb.tar.gz |
- fixed usage of subprocess module in runtest.py
- fixed tests in test/runtest (needed -j option for suppressing the count/percent messages)
Diffstat (limited to 'test/runtest')
-rw-r--r-- | test/runtest/aegis/batch-output.py | 2 | ||||
-rw-r--r-- | test/runtest/baseline/combined.py | 2 | ||||
-rw-r--r-- | test/runtest/baseline/fail.py | 2 | ||||
-rw-r--r-- | test/runtest/baseline/no_result.py | 2 | ||||
-rw-r--r-- | test/runtest/baseline/pass.py | 2 | ||||
-rw-r--r-- | test/runtest/fallback.py | 2 | ||||
-rw-r--r-- | test/runtest/noqmtest.py | 2 | ||||
-rw-r--r-- | test/runtest/print_time.py | 2 | ||||
-rw-r--r-- | test/runtest/python.py | 2 | ||||
-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 | ||||
-rw-r--r-- | test/runtest/src.py | 2 | ||||
-rw-r--r-- | test/runtest/testlistfile.py | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/test/runtest/aegis/batch-output.py b/test/runtest/aegis/batch-output.py index 68bd166d..e29183de 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 = '-o aegis.out --aegis test', stderr=expect_stderr) +test.run(arguments = '-j -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 119fc636..1983ae0a 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='-b . test', +test.run(arguments='-j -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 baa974a3..a96ba80c 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='-b . test/fail.py', +test.run(arguments='-j -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 8e0d0ddb..7a07c014 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='-b . test/no_result.py', +test.run(arguments='-j -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 77cd84d9..bcd87d72 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='-b . test', +test.run(arguments='-j -b . test', stdout=expect_stdout, stderr=expect_stderr) diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py index 3bfb9f42..ae7b8148 100644 --- a/test/runtest/fallback.py +++ b/test/runtest/fallback.py @@ -82,7 +82,7 @@ testlist = [ test_pass_py, ] -test.run(arguments = ' '.join(testlist), +test.run(arguments = '-j '+' '.join(testlist), status = 1, stdout = expect_stdout, stderr = expect_stderr) diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py index 9d0c8e32..e2cb5f8d 100644 --- a/test/runtest/noqmtest.py +++ b/test/runtest/noqmtest.py @@ -74,7 +74,7 @@ testlist = [ test_pass_py, ] -test.run(arguments = '--noqmtest %s' % ' '.join(testlist), +test.run(arguments = '-j --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 e0684475..dfce2738 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='-t test', +test.run(arguments='-j -t test', status=1, stdout=expect_stdout, stderr=expect_stderr) diff --git a/test/runtest/python.py b/test/runtest/python.py index 5c2f7377..b45e8d4a 100644 --- a/test/runtest/python.py +++ b/test/runtest/python.py @@ -66,7 +66,7 @@ expect_stderr = """\ PASSING TEST STDERR """ -test.run(arguments=['-P', mypython, 'test'], +test.run(arguments=['-j','-P', mypython, 'test'], stdout=expect_stdout, stderr=expect_stderr) diff --git a/test/runtest/simple/combined.py b/test/runtest/simple/combined.py index 68178201..6e0539ac 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='test', +test.run(arguments='-j test', status=1, stdout=expect_stdout, stderr=expect_stderr) diff --git a/test/runtest/simple/fail.py b/test/runtest/simple/fail.py index 36ec0d01..d8915970 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='test/fail.py', +test.run(arguments='-j 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 97dcede5..91ba50c2 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='test/no_result.py', +test.run(arguments='-j 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 6332e5fc..c9543368 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='test/pass.py', stdout=expect_stdout, stderr=expect_stderr) +test.run(arguments='-j 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 9136a4d7..84b08a09 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='src', stdout=expect_stdout, stderr=expect_stderr) +test.run(arguments='-j src', stdout=expect_stdout, stderr=expect_stderr) test.pass_test() diff --git a/test/runtest/testlistfile.py b/test/runtest/testlistfile.py index 8836c8e4..5a56bb35 100644 --- a/test/runtest/testlistfile.py +++ b/test/runtest/testlistfile.py @@ -62,7 +62,7 @@ expect_stderr = """\ PASSING TEST STDERR """ -test.run(arguments='-f t.txt', stdout=expect_stdout, stderr=expect_stderr) +test.run(arguments='-j -f t.txt', stdout=expect_stdout, stderr=expect_stderr) test.pass_test() |