diff options
| author | Francis Ricci <francisjricci@gmail.com> | 2016-10-04 18:48:00 +0000 |
|---|---|---|
| committer | Francis Ricci <francisjricci@gmail.com> | 2016-10-04 18:48:00 +0000 |
| commit | f833f173fbca19275d3cb36b96d1f7461c0a8fee (patch) | |
| tree | dd412624b13931e47c3e8d6bddb18d9382bd1935 /lldb/packages/Python/lldbsuite/test/test_result.py | |
| parent | fa262c98f8bb0618ed500b261e6098c63c93bfc6 (diff) | |
| download | bcm5719-llvm-f833f173fbca19275d3cb36b96d1f7461c0a8fee.tar.gz bcm5719-llvm-f833f173fbca19275d3cb36b96d1f7461c0a8fee.zip | |
Improvements to testing blacklist
Summary:
This patch is necessary because individual test cases are not required
to have unique names. Therefore, test cases must now
be specified explicitly in the form <TestCase>.<TestMethod>.
Because it works by regex matching, passing just <TestCase> will
still disable an entire file.
This also allows for multiple exclusion files to be specified.
Reviewers: zturner, labath, jingham, tfiala
Subscribers: lldb-commits, sas
Differential Revision: https://reviews.llvm.org/D24988
llvm-svn: 283238
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/test_result.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/test_result.py | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/test_result.py b/lldb/packages/Python/lldbsuite/test/test_result.py index 75e5fb80296..7bfe9708386 100644 --- a/lldb/packages/Python/lldbsuite/test/test_result.py +++ b/lldb/packages/Python/lldbsuite/test/test_result.py @@ -18,8 +18,6 @@ import os # Third-party modules import unittest2 -from unittest2.util import strclass - # LLDB Modules from . import configuration from lldbsuite.test_event.event_builder import EventBuilder @@ -139,8 +137,7 @@ class LLDBTestResult(unittest2.TextTestResult): self.getCategoriesForTest(test)): self.hardMarkAsSkipped(test) if self.checkExclusion( - configuration.skip_methods, - test._testMethodName): + configuration.skip_tests, test.id()): self.hardMarkAsSkipped(test) configuration.setCrashInfoHook( @@ -161,11 +158,7 @@ class LLDBTestResult(unittest2.TextTestResult): def addSuccess(self, test): if self.checkExclusion( - configuration.xfail_files, - strclass( - test.__class__)) or self.checkExclusion( - configuration.xfail_methods, - test._testMethodName): + configuration.xfail_tests, test.id()): self.addUnexpectedSuccess(test, None) return @@ -239,11 +232,7 @@ class LLDBTestResult(unittest2.TextTestResult): def addFailure(self, test, err): if self.checkExclusion( - configuration.xfail_files, - strclass( - test.__class__)) or self.checkExclusion( - configuration.xfail_methods, - test._testMethodName): + configuration.xfail_tests, test.id()): self.addExpectedFailure(test, err, None) return |
