From c41dba992957b89c77ff2ccb7909ff1254fa3f65 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Tue, 24 Sep 2019 00:27:13 +0000 Subject: Adapt test to upstream clang compiler changes. Clang now emits the correct C++ language version in DWARF. llvm-svn: 372677 --- .../lldbsuite/test/commands/frame/language/TestGuessLanguage.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite') diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py b/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py index 19fa3e9f0d8..ed3e9efb0a5 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py @@ -20,6 +20,7 @@ class TestFrameGuessLanguage(TestBase): # each debug info format. NO_DEBUG_INFO_TESTCASE = True + @skipIf(compiler="clang", compiler_version=['<', '10.0']) @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr37658") def test_guess_language(self): """Test GuessLanguage for C and C++.""" @@ -74,12 +75,14 @@ class TestFrameGuessLanguage(TestBase): thread = threads[0] c_frame_language = lldb.eLanguageTypeC99 + cxx_frame_language = lldb.eLanguageTypeC_plus_plus_11 # gcc emits DW_LANG_C89 even if -std=c99 was specified if "gcc" in self.getCompiler(): c_frame_language = lldb.eLanguageTypeC89 + cxx_frame_language = lldb.eLanguageTypeC_plus_plus self.check_language(thread, 0, c_frame_language) - self.check_language(thread, 1, lldb.eLanguageTypeC_plus_plus) + self.check_language(thread, 1, cxx_frame_language) self.check_language(thread, 2, lldb.eLanguageTypeC_plus_plus) -- cgit v1.2.3