[Lldb-commits] [lldb] r372677 - Adapt test to upstream clang compiler changes.

[Adrian Prantl via lldb-commits]

Author: adrian
Date: Mon Sep 23 17:27:13 2019
New Revision: 372677

URL: http://llvm.org/viewvc/llvm-project?rev=372677&view=rev
Log:
Adapt test to upstream clang compiler changes.

Clang now emits the correct C++ language version in DWARF.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py?rev=372677&r1=372676&r2=372677&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py Mon Sep 23 17:27:13 2019
@@ -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)