summaryrefslogtreecommitdiffstats
path: root/test/runtest
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-08-03 21:45:05 (GMT)
committerdirkbaechle <devnull@localhost>2012-08-03 21:45:05 (GMT)
commit7356cfca325dbd31d7817d374b70158dc76f9a35 (patch)
treea06aec636934dd57fc3f2d1fe48dc01f91a4f946 /test/runtest
parent4d8c8379e1d4c7860a1c1d29b7302b394c920844 (diff)
downloadSCons-7356cfca325dbd31d7817d374b70158dc76f9a35.zip
SCons-7356cfca325dbd31d7817d374b70158dc76f9a35.tar.gz
SCons-7356cfca325dbd31d7817d374b70158dc76f9a35.tar.bz2
- 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.py2
-rw-r--r--test/runtest/baseline/combined.py2
-rw-r--r--test/runtest/baseline/fail.py2
-rw-r--r--test/runtest/baseline/no_result.py2
-rw-r--r--test/runtest/baseline/pass.py2
-rw-r--r--test/runtest/fallback.py2
-rw-r--r--test/runtest/noqmtest.py2
-rw-r--r--test/runtest/print_time.py2
-rw-r--r--test/runtest/python.py2
-rw-r--r--test/runtest/simple/combined.py2
-rw-r--r--test/runtest/simple/fail.py2
-rw-r--r--test/runtest/simple/no_result.py2
-rw-r--r--test/runtest/simple/pass.py2
-rw-r--r--test/runtest/src.py2
-rw-r--r--test/runtest/testlistfile.py2
15 files changed, 15 insertions, 15 deletions
diff --git a/test/runtest/aegis/batch-output.py b/test/runtest/aegis/batch-output.py
index 68bd166..e29183d 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 119fc63..1983ae0 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 baa974a..a96ba80 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 8e0d0dd..7a07c01 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 77cd84d..bcd87d7 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 3bfb9f4..ae7b814 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 9d0c8e3..e2cb5f8 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 e068447..dfce273 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 5c2f737..b45e8d4 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 6817820..6e0539a 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 36ec0d0..d891597 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 97dcede..91ba50c 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 6332e5f..c954336 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 9136a4d..84b08a0 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 8836c8e..5a56bb3 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()