Skip to content

Commit f0bffb1

Browse files
authored
Fix the test to deal with non-deterministic output. (#96800)
When we check for the "struct CustomType" in the NODWP, we can just make sure that we have both types showing up, the next tests will validate the types are correct. Also added a "-DAG" to the integer and float types. This should fix the flakiness in this test.
1 parent 3f24561 commit f0bffb1

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,14 @@
3030
// RUN: -o "type lookup CustomType" \
3131
// RUN: -b %t | FileCheck %s --check-prefix=NODWP
3232
// NODWP: (lldb) type lookup IntegerType
33-
// NODWP-NEXT: int
34-
// NODWP-NEXT: unsigned int
33+
// NODWP-DAG: int
34+
// NODWP-DAG: unsigned int
3535
// NODWP: (lldb) type lookup FloatType
36-
// NODWP-NEXT: double
37-
// NODWP-NEXT: float
36+
// NODWP-DAG: double
37+
// NODWP-DAG: float
3838
// NODWP: (lldb) type lookup CustomType
39-
// NODWP-NEXT: struct CustomType {
40-
// NODWP-NEXT: typedef int IntegerType;
41-
// NODWP-NEXT: typedef double FloatType;
42-
// NODWP-NEXT: CustomType::IntegerType x;
43-
// NODWP-NEXT: CustomType::FloatType y;
44-
// NODWP-NEXT: }
45-
// NODWP-NEXT: struct CustomType {
46-
// NODWP-NEXT: typedef unsigned int IntegerType;
47-
// NODWP-NEXT: typedef float FloatType;
48-
// NODWP-NEXT: CustomType::IntegerType x;
49-
// NODWP-NEXT: CustomType::FloatType y;
50-
// NODWP-NEXT: }
39+
// NODWP: struct CustomType {
40+
// NODWP: struct CustomType {
5141

5242
// Check when we make the .dwp file with %t.main.dwo first so it will
5343
// pick the type unit from %t.main.dwo. Verify we find only the types from

0 commit comments

Comments
 (0)