summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2014-03-21 07:13:28 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2014-03-21 07:13:28 (GMT)
commitffd96219e173cdc643a28fe44d344e274a156ce0 (patch)
tree5f26210d772581a62fe380069bde57d1ca52f4e8 /runtest.py
parentcaab0eacef8dccda042b01fb8cc6f48821bd0239 (diff)
downloadSCons-ffd96219e173cdc643a28fe44d344e274a156ce0.zip
SCons-ffd96219e173cdc643a28fe44d344e274a156ce0.tar.gz
SCons-ffd96219e173cdc643a28fe44d344e274a156ce0.tar.bz2
runtest.py: Make sure --runner argument is only passed to unit tests
Diffstat (limited to 'runtest.py')
-rwxr-xr-xruntest.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/runtest.py b/runtest.py
index 267915a..f9a99dd 100755
--- a/runtest.py
+++ b/runtest.py
@@ -713,7 +713,10 @@ else:
for p in find_py(path):
endtests.append(p)
else:
- tests.append(path)
+ if path.endswith("Tests.py"):
+ unittests.append(path)
+ else:
+ endtests.append(path)
tests.extend(unittests)
tests.extend(endtests)
@@ -771,7 +774,7 @@ def run_test(t, io_lock, async=True):
if debug:
command_args.append(debug)
command_args.append(t.path)
- if options.runner:
+ if options.runner and t.path in unittests:
# For example --runner TestUnit.TAPTestRunner
command_args.append('--runner ' + options.runner)
t.command_args = [python] + command_args