diff options
| author | Pavel Labath <pavel@labath.sk> | 2019-03-27 15:52:11 +0000 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2019-03-27 15:52:11 +0000 |
| commit | 9f1a7e559ceac80fc2a2956a3e005bc1d81fcd68 (patch) | |
| tree | 60f35121d16dce1447bf163c103d4a335ca1f420 /lldb/packages/Python/lldbsuite | |
| parent | daf43ed80042f511c53635d7163f747b47d032e7 (diff) | |
| download | bcm5719-llvm-9f1a7e559ceac80fc2a2956a3e005bc1d81fcd68.tar.gz bcm5719-llvm-9f1a7e559ceac80fc2a2956a3e005bc1d81fcd68.zip | |
Rename some variables in the std-module tests
They cause failures on some systems due to an unrelated bug (pr35043).
This works around that.
llvm-svn: 357080
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py b/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py index 2b87c2e5711..19e02ca84c9 100644 --- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py +++ b/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py @@ -31,7 +31,7 @@ class ImportStdModule(TestBase): # Using types from std. self.expect("expr (std::size_t)33U", substrs=['(size_t) $2 = 33']) # Calling templated functions that return non-template types. - self.expect("expr char a = 'b'; char b = 'a'; std::swap(a, b); a", + self.expect("expr char char_a = 'b'; char char_b = 'a'; std::swap(char_a, char_b); char_a", substrs=["(char) $3 = 'a'"]) # FIXME: This should work on more setups, so remove these diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py b/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py index 8be474e39ce..2abaece27fe 100644 --- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py +++ b/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py @@ -32,5 +32,5 @@ class TestImportStdModuleConflicts(TestBase): self.expect("expr std::abs(-42)", substrs=['(int) $0 = 42']) self.expect("expr std::div(2, 1).quot", substrs=['(int) $1 = 2']) self.expect("expr (std::size_t)33U", substrs=['(size_t) $2 = 33']) - self.expect("expr char a = 'b'; char b = 'a'; std::swap(a, b); a", + self.expect("expr char char_a = 'b'; char char_b = 'a'; std::swap(char_a, char_b); char_a", substrs=["(char) $3 = 'a'"]) |
