summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2014-03-21 10:13:28 +0300
committeranatoly techtonik <techtonik@gmail.com>2014-03-21 10:13:28 +0300
commit250206cb23637b06c78a244742af69b8c29d0622 (patch)
tree5f26210d772581a62fe380069bde57d1ca52f4e8
parent82b21af7a4d7a10779cede5c9ba772006874ca03 (diff)
downloadscons-250206cb23637b06c78a244742af69b8c29d0622.tar.gz
runtest.py: Make sure --runner argument is only passed to unit tests
-rwxr-xr-xruntest.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/runtest.py b/runtest.py
index 267915ae..f9a99dd0 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