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

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 2b87c2e..19e02ca 100644 (file)
--- 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 8be474e..2abaece 100644 (file)
--- 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'"])