Skip to content

Commit c1f2fb5

Browse files
committed
[DebugInfo] Support both forward and backward slashes in tests
This addresses test failure revealed by 042c235.
1 parent e15996b commit c1f2fb5

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

lld/test/COFF/duplicate-dwarf.s

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
# RUN: not lld-link -lldmingw -out:%t.exe %t.o %t.dupl.o -entry:_Z4funcv 2>&1 | FileCheck %s
55

66
# CHECK: error: duplicate symbol: func()
7-
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:6
7+
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:6
88
# CHECK-NEXT: >>> {{.*}}.o
9-
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:6
9+
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:6
1010
# CHECK-NEXT: >>> {{.*}}.o
1111
# CHECK-EMPTY:
1212
# CHECK-NEXT: error: duplicate symbol: _var
13-
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:1
13+
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:1
1414
# CHECK-NEXT: >>> {{.*}}.o
15-
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:1
15+
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:1
1616
# CHECK-NEXT: >>> {{.*}}.o
1717
# CHECK-EMPTY:
1818
# CHECK-NEXT: error: duplicate symbol: A::namespaceVar
19-
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:3
19+
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:3
2020
# CHECK-NEXT: >>> {{.*}}.o
21-
# CHECK-NEXT: >>> defined at /path/to/src{{[/\\]}}dupl.cpp:3
21+
# CHECK-NEXT: >>> defined at /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}dupl.cpp:3
2222
# CHECK-NEXT: >>> {{.*}}.o
2323

2424
.text

lld/test/COFF/undefined-symbol-dwarf.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# RUN: not lld-link /lldmingw /out:%t.exe %t.o /entry:entry 2>&1 | FileCheck %s
44

55
# CHECK: error: undefined symbol: bar()
6-
# CHECK-NEXT: >>> referenced by /path/to/src{{[/\\]}}undef.cpp:17
6+
# CHECK-NEXT: >>> referenced by /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}undef.cpp:17
77
# CHECK-NEXT: >>> {{.*}}.o:(entry)
88
# CHECK-EMPTY:
99
# CHECK-NEXT: error: undefined symbol: foo()
10-
# CHECK-NEXT: >>> referenced by /path/to/src{{[/\\]}}undef.cpp:7
10+
# CHECK-NEXT: >>> referenced by /path{{[/\\]}}to{{[/\\]}}src{{[/\\]}}undef.cpp:7
1111
# CHECK-NEXT: >>> {{.*}}.o:(A::afunc())
1212

1313
.text

lld/test/ELF/conflict-debug-variable2.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
# INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000027] = "foo")
88
# INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")
99
# INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
10-
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")
10+
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home{{[/\\]}}path{{[/\\]}}test.c")
1111
# INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (1)
1212
# INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)
1313
# INPUT: DW_TAG_variable
1414
# INPUT-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x0000002f] = "bar")
1515
# INPUT-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0033 => {0x00000033} "int")
1616
# INPUT-NEXT: DW_AT_external [DW_FORM_flag_present] (true)
17-
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home/path/test.c")
17+
# INPUT-NEXT: DW_AT_decl_file [DW_FORM_data1] ("/home{{[/\\]}}path{{[/\\]}}test.c")
1818
# INPUT-NEXT: DW_AT_decl_line [DW_FORM_data1] (2)
1919
# INPUT-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addr 0x0)
2020

lld/test/wasm/debuginfo.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ CHECK-NEXT: DW_AT_low_pc
1616
CHECK-NEXT: DW_AT_high_pc
1717
CHECK-NEXT: DW_AT_frame_base
1818
CHECK-NEXT: DW_AT_name ("test")
19-
CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
19+
CHECK-NEXT: DW_AT_decl_file ("/Users{{[/\\]}}yury{{[/\\]}}llvmwasm{{(/|\\)}}hi.c")
2020
CHECK-NEXT: DW_AT_decl_line (3)
2121
CHECK-NEXT: DW_AT_prototyped (true)
2222

2323
CHECK: DW_TAG_formal_parameter
2424
CHECK-NEXT: DW_AT_name ("t")
25-
CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
25+
CHECK-NEXT: DW_AT_decl_file ("/Users{{[/\\]}}yury{{[/\\]}}llvmwasm{{(/|\\)}}hi.c")
2626
CHECK-NEXT: DW_AT_decl_line (3)
2727

2828
CHECK: DW_TAG_subprogram
2929
CHECK-NEXT: DW_AT_low_pc
3030
CHECK-NEXT: DW_AT_high_pc
3131
CHECK-NEXT: DW_AT_frame_base
3232
CHECK-NEXT: DW_AT_name ("_start")
33-
CHECK-NEXT: DW_AT_decl_file ("/Users/yury/llvmwasm{{(/|\\)}}hi.c")
33+
CHECK-NEXT: DW_AT_decl_file ("/Users{{[/\\]}}yury{{[/\\]}}llvmwasm{{(/|\\)}}hi.c")
3434
CHECK-NEXT: DW_AT_decl_line (7)
3535

3636
CHECK: DW_TAG_base_type

0 commit comments

Comments
 (0)