diff options
| author | Zachary Turner <zturner@google.com> | 2016-01-27 18:49:31 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-01-27 18:49:31 +0000 |
| commit | 7289e43831d55be74a2814f2bd83789e5f390a76 (patch) | |
| tree | 66438ba12e524c9cffb5d2f4dceb385b64d6f238 /lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert | |
| parent | 74b7965d3861ea5bf252701b5d1814cd7e430c87 (diff) | |
| download | bcm5719-llvm-7289e43831d55be74a2814f2bd83789e5f390a76.tar.gz bcm5719-llvm-7289e43831d55be74a2814f2bd83789e5f390a76.zip | |
Refactor some of the xfail / skip decorators to share logic.
Previously the logic of skipIf and expectedFailure were 99%
the same, but they took different sets of arguments since they
were maintained separately, and had slightly differences in
their behavior. This makes everything consistent, there is now
only one real implementation, and the previous ones are changed
to use the single master implementation.
llvm-svn: 258966
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py index 63d01c12ed4..aba8002ee38 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py @@ -60,7 +60,8 @@ class AssertingInferiorTestCase(TestBase): lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True) def check_stop_reason(self): - if matchAndroid(api_levels=list(range(1, 16+1)))(self): + match_result, _ = matchAndroid(api_levels=list(range(1, 16+1)))(self) + if match_result: # On android until API-16 the abort() call ended in a sigsegv instead of in a sigabrt stop_reason = 'stop reason = signal SIGSEGV' else: |
