Skip to content

Commit b0b4a8e

Browse files
authored
[lldb][test] Fix language note tests on Windows (#162995)
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.
1 parent 3bfb5b0 commit b0b4a8e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,9 @@ def check_error(diags):
218218
# Detail 1/3: note: requested expression language
219219
diag = details.GetItemAtIndex(0)
220220
self.assertEqual(str(diag.GetValueForKey("severity")), "note")
221-
self.assertEqual(
222-
str(diag.GetValueForKey("message")), "Ran expression as 'C++11'."
223-
)
224-
self.assertEqual(
225-
str(diag.GetValueForKey("rendered")), "Ran expression as 'C++11'."
221+
self.assertIn("Ran expression as 'C++", str(diag.GetValueForKey("message")))
222+
self.assertIn(
223+
"Ran expression as 'C++", str(diag.GetValueForKey("rendered"))
226224
)
227225
self.assertEqual(str(diag.GetValueForKey("source_location")), "")
228226
self.assertEqual(str(diag.GetValueForKey("file")), "")

lldb/test/Shell/Expr/TestExprLanguageNote.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ run
2626
expr blah
2727

2828
# CHECK-TARGET: (lldb) expr
29-
# CHECK-TARGET: note: Ran expression as 'C++14'.
29+
# CHECK-TARGET: note: Ran expression as 'C++{{.*}}'
3030

3131
expr -l objc -- blah
3232

0 commit comments

Comments
 (0)