[lldb] Fix the flaky test dwp-foreign-type-units.cpp. #98237
Merged
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
Use `--match-full-lines` with FileCheck. Otherwise, the checks for `int` and `unsigned int` will match to the fields inside two `CustomType`s and FileCheck will start scanning from there, causing stirng not found error.
|
@llvm/pr-subscribers-lldb Author: Zequan Wu (ZequanWu) ChangesUse Full diff: https://github.com/llvm/llvm-project/pull/98237.diff 1 Files Affected:
diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp
index ef15d418b4cfe..415b4850a244c 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp
@@ -1,6 +1,4 @@
// REQUIRES: lld
-// Is flaky on Windows.
-// UNSUPPORTED: system-windows
// This test will make a type that will be compiled differently into two
// different .dwo files in a type unit with the same type hash, but with
@@ -30,7 +28,7 @@
// RUN: -o "type lookup IntegerType" \
// RUN: -o "type lookup FloatType" \
// RUN: -o "type lookup CustomType" \
-// RUN: -b %t | FileCheck %s --check-prefix=NODWP
+// RUN: -b %t | FileCheck %s --check-prefix=NODWP --match-full-lines
// NODWP: (lldb) type lookup IntegerType
// NODWP-DAG: int
// NODWP-DAG: unsigned int
|
|
Thanks! You've saved me some work here. We've been seeing this fail on the Linuxes too since I disabled it for Windows. |
DavidSpickett
approved these changes
Jul 10, 2024
|
cI failure is unrelated: Which is the other flaky test on my list to look at... |
|
In case we need them for future reference, some failures this aims to fix: |
DavidSpickett
added a commit
that referenced
this pull request
Jul 10, 2024
This has been flakey lately on Linux on the buildbots and in CI on PRs. For example: https://lab.llvm.org/buildbot/#/builders/59/builds/1324 #98237 I will try to track down the cause tomorrow.
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
Use `--match-full-lines` with FileCheck. Otherwise, the checks for `int` and `unsigned int` will match to the fields inside two `CustomType`s and FileCheck will start scanning from there, causing string not found error.
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
This has been flakey lately on Linux on the buildbots and in CI on PRs. For example: https://lab.llvm.org/buildbot/#/builders/59/builds/1324 llvm#98237 I will try to track down the cause tomorrow.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use
--match-full-lineswith FileCheck. Otherwise, the checks forintandunsigned intwill match to the fields inside twoCustomTypes and FileCheck will start scanning from there, causing string not found error.