[Lldb-commits] [lldb] [lldb][test] Fix language note tests on Windows (PR #162995)

[via lldb-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Michael Buch (Michael137)

<details>
<summary>Changes</summary>

The LLDB test-suite compiles the tests on Windows with 'C++14' by default:
https://github.com/llvm/llvm-project/blob/3bfb5b0e7ccbcb9f127f5b9c958e6499ba9c0523/lldb/packages/Python/lldbsuite/test/make/Makefile.rules#L357-L360

This fixes Windows buildbot failures.

---
Full diff: https://github.com/llvm/llvm-project/pull/162995.diff


2 Files Affected:

- (modified) lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py (+4-4) 
- (modified) lldb/test/Shell/Expr/TestExprLanguageNote.test (+1-1) 


``````````diff
diff --git a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
index ec208f2c32503..bd468f272d15d 100644
--- a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
+++ b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
@@ -218,11 +218,11 @@ def check_error(diags):
             # Detail 1/3: note: requested expression language
             diag = details.GetItemAtIndex(0)
             self.assertEqual(str(diag.GetValueForKey("severity")), "note")
-            self.assertEqual(
-                str(diag.GetValueForKey("message")), "Ran expression as 'C++11'."
+            self.assertIn(
+                "Ran expression as 'C++", str(diag.GetValueForKey("message"))
             )
-            self.assertEqual(
-                str(diag.GetValueForKey("rendered")), "Ran expression as 'C++11'."
+            self.assertIn(
+                "Ran expression as 'C++", str(diag.GetValueForKey("rendered"))
             )
             self.assertEqual(str(diag.GetValueForKey("source_location")), "")
             self.assertEqual(str(diag.GetValueForKey("file")), "")
diff --git a/lldb/test/Shell/Expr/TestExprLanguageNote.test b/lldb/test/Shell/Expr/TestExprLanguageNote.test
index f3dc5928fcca9..b4387bf9121ae 100644
--- a/lldb/test/Shell/Expr/TestExprLanguageNote.test
+++ b/lldb/test/Shell/Expr/TestExprLanguageNote.test
@@ -26,7 +26,7 @@ run
 expr blah
 
 # CHECK-TARGET: (lldb) expr
-# CHECK-TARGET: note: Ran expression as 'C++14'.
+# CHECK-TARGET: note: Ran expression as 'C++{{.*}}'
 
 expr -l objc -- blah
 

``````````

</details>


https://github.com/llvm/llvm-project/pull/162995