[lldb][test] Fix language note tests on Windows #162995
Merged
+4
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Don't have a Windows machine to test this on, so relying on CI to tell me. |
|
@llvm/pr-subscribers-lldb Author: Michael Buch (Michael137) ChangesThe LLDB test-suite compiles the tests on Windows with 'C++14' by default: llvm-project/lldb/packages/Python/lldbsuite/test/make/Makefile.rules Lines 357 to 360 in 3bfb5b0 This fixes Windows buildbot failures. Full diff: https://github.com/llvm/llvm-project/pull/162995.diff 2 Files Affected:
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
|
|
✅ With the latest revision this PR passed the Python code formatter. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The LLDB test-suite compiles the tests on Windows with 'C++14' by default:
llvm-project/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
Lines 357 to 360 in 3bfb5b0
This fixes Windows buildbot failures.