diff options
| author | Zachary Turner <zturner@google.com> | 2016-02-03 19:12:30 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-02-03 19:12:30 +0000 |
| commit | 62d3a6570afd635986912a7b9cb5791bc37da137 (patch) | |
| tree | 13456c00ebc94f627685f7bf2b4111985bbc8510 /lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert | |
| parent | c2d2f44683f0e413d3498e6cc5703a131f64c61c (diff) | |
| download | bcm5719-llvm-62d3a6570afd635986912a7b9cb5791bc37da137.tar.gz bcm5719-llvm-62d3a6570afd635986912a7b9cb5791bc37da137.zip | |
Move some android platform functions to lldbplatformutil.
My eventual goal is to move all of the test decorators to their
own module such as `decorators.py`. But some of the decorators
use existing functions in `lldbtest.py` and conceptually the
functions are probably more appropriately placed in lldbplatformutil.
Moreover, lldbtest.py is a huge file with a ton of random utility
functions scattered around, so this patch also workds toward the
goal of reducing the footprint of this one module to a more
reasonable size.
So this patch moves some of them over to lldbplatformutil with the
eventual goal of moving decorators over to their own module.
Reviewed By: Tamas Berghammer, Pavel Labath
Differential Revision: http://reviews.llvm.org/D16830
llvm-svn: 259680
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py | 8 |
1 files changed, 4 insertions, 4 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 b4601c127c6..793956963fb 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py @@ -6,8 +6,8 @@ from __future__ import print_function import os, time import lldb -import lldbsuite.test.lldbutil as lldbutil -import lldbsuite.test.lldbplatformutil as lldbplatformutil +from lldbsuite.test import lldbutil +from lldbsuite.test import lldbplatformutil from lldbsuite.test.lldbtest import * class AssertingInferiorTestCase(TestBase): @@ -60,8 +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): - match_result = matchAndroid(api_levels=list(range(1, 16+1)))(self) - if match_result is not None: + matched = lldbplatformutil.match_android_device(self.getArchitecture(), valid_api_levels=list(range(1, 16+1))) + if matched: # On android until API-16 the abort() call ended in a sigsegv instead of in a sigabrt stop_reason = 'stop reason = signal SIGSEGV' else: |
