From a1d52617a36959a04b8fc36f03d31ef495de1326 Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Sat, 11 Oct 2025 12:56:17 +0100 Subject: [PATCH 1/2] [lldb][test] Fix language note tests on Windows 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. --- .../expression/diagnostics/TestExprDiagnostics.py | 8 ++++---- lldb/test/Shell/Expr/TestExprLanguageNote.test | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 From f60be74c78e869cd33e0f89927479ede5551df0b Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Sat, 11 Oct 2025 13:03:13 +0100 Subject: [PATCH 2/2] fixup! python format --- .../commands/expression/diagnostics/TestExprDiagnostics.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py index bd468f272d15d..759b620105c4e 100644 --- a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py +++ b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py @@ -218,9 +218,7 @@ def check_error(diags): # Detail 1/3: note: requested expression language diag = details.GetItemAtIndex(0) self.assertEqual(str(diag.GetValueForKey("severity")), "note") - self.assertIn( - "Ran expression as 'C++", str(diag.GetValueForKey("message")) - ) + self.assertIn("Ran expression as 'C++", str(diag.GetValueForKey("message"))) self.assertIn( "Ran expression as 'C++", str(diag.GetValueForKey("rendered")) )