Author: labath Date: Wed Mar 27 08:52:11 2019 New Revision: 357080 URL: http://llvm.org/viewvc/llvm-project?rev=357080&view=rev Log: Rename some variables in the std-module tests
They cause failures on some systems due to an unrelated bug (pr35043). This works around that. Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py?rev=357080&r1=357079&r2=357080&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py Wed Mar 27 08:52:11 2019 @@ -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 Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py?rev=357080&r1=357079&r2=357080&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py Wed Mar 27 08:52:11 2019 @@ -32,5 +32,5 @@ class TestImportStdModuleConflicts(TestB 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'"]) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits