Skip to content

Commit 9055f28

Browse files
philipcphilipc
authored
Replace output_equivalence test with regression tests (#333)
Bug fixes require us to have different output from binutils addr2line, but we don't exactly match llvm-addr2line either, so there is no good way to compare our output against existing tools. Switch to using a regression test for our output instead.
1 parent f4e1bef commit 9055f28

34 files changed

+1308
-142
lines changed

‎Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ cargo-all = []
7070
# stable interface of this crate.
7171
rustc-dep-of-std = ['core', 'alloc', 'compiler_builtins', 'gimli/rustc-dep-of-std']
7272

73-
[[test]]
74-
name = "output_equivalence"
75-
harness = false
76-
required-features = ["bin"]
77-
7873
[[test]]
7974
name = "testinput"
8075
harness = false

‎testoutput/flags/base-a

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
0x0000000000001060
2+
/object/testfiles/dwarf/base.cpp:26
3+
0x0000000000001068
4+
/object/testfiles/dwarf/base.cpp:26
5+
0x000000000000106a
6+
/object/testfiles/dwarf/base.cpp:26
7+
0x000000000000107a
8+
/object/testfiles/dwarf/base.cpp:28
9+
0x000000000000107f
10+
/object/testfiles/dwarf/base.cpp:28
11+
0x0000000000001084
12+
/object/testfiles/dwarf/base.cpp:30
13+
0x0000000000001190
14+
/object/testfiles/dwarf/base.cpp:12
15+
0x0000000000001194
16+
/object/testfiles/dwarf/base.cpp:14
17+
0x00000000000011b0
18+
/object/testfiles/dwarf/base.cpp:15
19+
0x00000000000011b3
20+
/object/testfiles/dwarf/base.cpp:15
21+
0x00000000000011b7
22+
/object/testfiles/dwarf/base.cpp:15
23+
0x00000000000011bb
24+
/object/testfiles/dwarf/base.cpp:14
25+
0x00000000000011c0
26+
/object/testfiles/dwarf/base.cpp:16
27+
0x00000000000011d0
28+
/object/testfiles/dwarf/base.cpp:19
29+
0x00000000000011d4
30+
/object/testfiles/dwarf/base.cpp:20
31+
0x0000000000001200
32+
/object/testfiles/dwarf/base.cpp:15
33+
0x0000000000001203
34+
/object/testfiles/dwarf/base.cpp:15
35+
0x0000000000001207
36+
/object/testfiles/dwarf/base.cpp:15
37+
0x000000000000120b
38+
/object/testfiles/dwarf/base.cpp:14
39+
0x0000000000001230
40+
/object/testfiles/dwarf/base.cpp:15
41+
0x0000000000001233
42+
/object/testfiles/dwarf/base.cpp:15
43+
0x0000000000001237
44+
/object/testfiles/dwarf/base.cpp:15
45+
0x000000000000123b
46+
/object/testfiles/dwarf/base.cpp:14
47+
0x0000000000001240
48+
/object/testfiles/dwarf/base.cpp:24

‎testoutput/flags/base-af

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
0x0000000000001060
2+
main
3+
/object/testfiles/dwarf/base.cpp:26
4+
0x0000000000001068
5+
main
6+
/object/testfiles/dwarf/base.cpp:26
7+
0x000000000000106a
8+
main
9+
/object/testfiles/dwarf/base.cpp:26
10+
0x000000000000107a
11+
main
12+
/object/testfiles/dwarf/base.cpp:28
13+
0x000000000000107f
14+
main
15+
/object/testfiles/dwarf/base.cpp:28
16+
0x0000000000001084
17+
main
18+
/object/testfiles/dwarf/base.cpp:30
19+
0x0000000000001190
20+
_ZN3Foo3barEPKc
21+
/object/testfiles/dwarf/base.cpp:12
22+
0x0000000000001194
23+
_ZN3Foo3barEPKc
24+
/object/testfiles/dwarf/base.cpp:14
25+
0x00000000000011b0
26+
_ZN3Foo3barEPKc
27+
/object/testfiles/dwarf/base.cpp:15
28+
0x00000000000011b3
29+
_ZN3Foo3barEPKc
30+
/object/testfiles/dwarf/base.cpp:15
31+
0x00000000000011b7
32+
_ZN3Foo3barEPKc
33+
/object/testfiles/dwarf/base.cpp:15
34+
0x00000000000011bb
35+
_ZN3Foo3barEPKc
36+
/object/testfiles/dwarf/base.cpp:14
37+
0x00000000000011c0
38+
_ZN3Foo3barEPKc
39+
/object/testfiles/dwarf/base.cpp:16
40+
0x00000000000011d0
41+
_ZN3Foo3fooEi
42+
/object/testfiles/dwarf/base.cpp:19
43+
0x00000000000011d4
44+
_ZN3Foo3fooEi
45+
/object/testfiles/dwarf/base.cpp:20
46+
0x0000000000001200
47+
_ZN3Foo3barEPKc
48+
/object/testfiles/dwarf/base.cpp:15
49+
0x0000000000001203
50+
_ZN3Foo3barEPKc
51+
/object/testfiles/dwarf/base.cpp:15
52+
0x0000000000001207
53+
_ZN3Foo3barEPKc
54+
/object/testfiles/dwarf/base.cpp:15
55+
0x000000000000120b
56+
_ZN3Foo3barEPKc
57+
/object/testfiles/dwarf/base.cpp:14
58+
0x0000000000001230
59+
_ZN3Foo3barEPKc
60+
/object/testfiles/dwarf/base.cpp:15
61+
0x0000000000001233
62+
_ZN3Foo3barEPKc
63+
/object/testfiles/dwarf/base.cpp:15
64+
0x0000000000001237
65+
_ZN3Foo3barEPKc
66+
/object/testfiles/dwarf/base.cpp:15
67+
0x000000000000123b
68+
_ZN3Foo3barEPKc
69+
/object/testfiles/dwarf/base.cpp:14
70+
0x0000000000001240
71+
_ZN3Foo3fooEi
72+
/object/testfiles/dwarf/base.cpp:24

‎testoutput/flags/base-ai

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
0x0000000000001060
2+
/object/testfiles/dwarf/base.cpp:26
3+
0x0000000000001068
4+
/object/testfiles/dwarf/base.cpp:26
5+
0x000000000000106a
6+
/object/testfiles/dwarf/base.cpp:26
7+
0x000000000000107a
8+
/object/testfiles/dwarf/base.cpp:28
9+
0x000000000000107f
10+
/object/testfiles/dwarf/base.cpp:28
11+
0x0000000000001084
12+
/object/testfiles/dwarf/base.cpp:30
13+
0x0000000000001190
14+
/object/testfiles/dwarf/base.cpp:12
15+
0x0000000000001194
16+
/object/testfiles/dwarf/base.cpp:14
17+
0x00000000000011b0
18+
/object/testfiles/dwarf/base.cpp:15
19+
0x00000000000011b3
20+
/object/testfiles/dwarf/base.cpp:15
21+
0x00000000000011b7
22+
/object/testfiles/dwarf/base.cpp:15
23+
0x00000000000011bb
24+
/object/testfiles/dwarf/base.cpp:14
25+
0x00000000000011c0
26+
/object/testfiles/dwarf/base.cpp:16
27+
0x00000000000011d0
28+
/object/testfiles/dwarf/base.cpp:19
29+
0x00000000000011d4
30+
/object/testfiles/dwarf/base.cpp:20
31+
0x0000000000001200
32+
/object/testfiles/dwarf/base.cpp:15
33+
/object/testfiles/dwarf/base.cpp:21
34+
0x0000000000001203
35+
/object/testfiles/dwarf/base.cpp:15
36+
/object/testfiles/dwarf/base.cpp:21
37+
0x0000000000001207
38+
/object/testfiles/dwarf/base.cpp:15
39+
/object/testfiles/dwarf/base.cpp:21
40+
0x000000000000120b
41+
/object/testfiles/dwarf/base.cpp:14
42+
/object/testfiles/dwarf/base.cpp:21
43+
0x0000000000001230
44+
/object/testfiles/dwarf/base.cpp:15
45+
/object/testfiles/dwarf/base.cpp:23
46+
0x0000000000001233
47+
/object/testfiles/dwarf/base.cpp:15
48+
/object/testfiles/dwarf/base.cpp:23
49+
0x0000000000001237
50+
/object/testfiles/dwarf/base.cpp:15
51+
/object/testfiles/dwarf/base.cpp:23
52+
0x000000000000123b
53+
/object/testfiles/dwarf/base.cpp:14
54+
/object/testfiles/dwarf/base.cpp:23
55+
0x0000000000001240
56+
/object/testfiles/dwarf/base.cpp:24

‎testoutput/flags/base-aif

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
0x0000000000001060
2+
main
3+
/object/testfiles/dwarf/base.cpp:26
4+
0x0000000000001068
5+
main
6+
/object/testfiles/dwarf/base.cpp:26
7+
0x000000000000106a
8+
main
9+
/object/testfiles/dwarf/base.cpp:26
10+
0x000000000000107a
11+
main
12+
/object/testfiles/dwarf/base.cpp:28
13+
0x000000000000107f
14+
main
15+
/object/testfiles/dwarf/base.cpp:28
16+
0x0000000000001084
17+
main
18+
/object/testfiles/dwarf/base.cpp:30
19+
0x0000000000001190
20+
_ZN3Foo3barEPKc
21+
/object/testfiles/dwarf/base.cpp:12
22+
0x0000000000001194
23+
_ZN3Foo3barEPKc
24+
/object/testfiles/dwarf/base.cpp:14
25+
0x00000000000011b0
26+
_ZN3Foo3barEPKc
27+
/object/testfiles/dwarf/base.cpp:15
28+
0x00000000000011b3
29+
_ZN3Foo3barEPKc
30+
/object/testfiles/dwarf/base.cpp:15
31+
0x00000000000011b7
32+
_ZN3Foo3barEPKc
33+
/object/testfiles/dwarf/base.cpp:15
34+
0x00000000000011bb
35+
_ZN3Foo3barEPKc
36+
/object/testfiles/dwarf/base.cpp:14
37+
0x00000000000011c0
38+
_ZN3Foo3barEPKc
39+
/object/testfiles/dwarf/base.cpp:16
40+
0x00000000000011d0
41+
_ZN3Foo3fooEi
42+
/object/testfiles/dwarf/base.cpp:19
43+
0x00000000000011d4
44+
_ZN3Foo3fooEi
45+
/object/testfiles/dwarf/base.cpp:20
46+
0x0000000000001200
47+
_ZN3Foo3barEPKc
48+
/object/testfiles/dwarf/base.cpp:15
49+
_ZN3Foo3fooEi
50+
/object/testfiles/dwarf/base.cpp:21
51+
0x0000000000001203
52+
_ZN3Foo3barEPKc
53+
/object/testfiles/dwarf/base.cpp:15
54+
_ZN3Foo3fooEi
55+
/object/testfiles/dwarf/base.cpp:21
56+
0x0000000000001207
57+
_ZN3Foo3barEPKc
58+
/object/testfiles/dwarf/base.cpp:15
59+
_ZN3Foo3fooEi
60+
/object/testfiles/dwarf/base.cpp:21
61+
0x000000000000120b
62+
_ZN3Foo3barEPKc
63+
/object/testfiles/dwarf/base.cpp:14
64+
_ZN3Foo3fooEi
65+
/object/testfiles/dwarf/base.cpp:21
66+
0x0000000000001230
67+
_ZN3Foo3barEPKc
68+
/object/testfiles/dwarf/base.cpp:15
69+
_ZN3Foo3fooEi
70+
/object/testfiles/dwarf/base.cpp:23
71+
0x0000000000001233
72+
_ZN3Foo3barEPKc
73+
/object/testfiles/dwarf/base.cpp:15
74+
_ZN3Foo3fooEi
75+
/object/testfiles/dwarf/base.cpp:23
76+
0x0000000000001237
77+
_ZN3Foo3barEPKc
78+
/object/testfiles/dwarf/base.cpp:15
79+
_ZN3Foo3fooEi
80+
/object/testfiles/dwarf/base.cpp:23
81+
0x000000000000123b
82+
_ZN3Foo3barEPKc
83+
/object/testfiles/dwarf/base.cpp:14
84+
_ZN3Foo3fooEi
85+
/object/testfiles/dwarf/base.cpp:23
86+
0x0000000000001240
87+
_ZN3Foo3fooEi
88+
/object/testfiles/dwarf/base.cpp:24

‎testoutput/flags/base-aip

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
0x0000000000001060: /object/testfiles/dwarf/base.cpp:26
2+
0x0000000000001068: /object/testfiles/dwarf/base.cpp:26
3+
0x000000000000106a: /object/testfiles/dwarf/base.cpp:26
4+
0x000000000000107a: /object/testfiles/dwarf/base.cpp:28
5+
0x000000000000107f: /object/testfiles/dwarf/base.cpp:28
6+
0x0000000000001084: /object/testfiles/dwarf/base.cpp:30
7+
0x0000000000001190: /object/testfiles/dwarf/base.cpp:12
8+
0x0000000000001194: /object/testfiles/dwarf/base.cpp:14
9+
0x00000000000011b0: /object/testfiles/dwarf/base.cpp:15
10+
0x00000000000011b3: /object/testfiles/dwarf/base.cpp:15
11+
0x00000000000011b7: /object/testfiles/dwarf/base.cpp:15
12+
0x00000000000011bb: /object/testfiles/dwarf/base.cpp:14
13+
0x00000000000011c0: /object/testfiles/dwarf/base.cpp:16
14+
0x00000000000011d0: /object/testfiles/dwarf/base.cpp:19
15+
0x00000000000011d4: /object/testfiles/dwarf/base.cpp:20
16+
0x0000000000001200: /object/testfiles/dwarf/base.cpp:15
17+
(inlined by) /object/testfiles/dwarf/base.cpp:21
18+
0x0000000000001203: /object/testfiles/dwarf/base.cpp:15
19+
(inlined by) /object/testfiles/dwarf/base.cpp:21
20+
0x0000000000001207: /object/testfiles/dwarf/base.cpp:15
21+
(inlined by) /object/testfiles/dwarf/base.cpp:21
22+
0x000000000000120b: /object/testfiles/dwarf/base.cpp:14
23+
(inlined by) /object/testfiles/dwarf/base.cpp:21
24+
0x0000000000001230: /object/testfiles/dwarf/base.cpp:15
25+
(inlined by) /object/testfiles/dwarf/base.cpp:23
26+
0x0000000000001233: /object/testfiles/dwarf/base.cpp:15
27+
(inlined by) /object/testfiles/dwarf/base.cpp:23
28+
0x0000000000001237: /object/testfiles/dwarf/base.cpp:15
29+
(inlined by) /object/testfiles/dwarf/base.cpp:23
30+
0x000000000000123b: /object/testfiles/dwarf/base.cpp:14
31+
(inlined by) /object/testfiles/dwarf/base.cpp:23
32+
0x0000000000001240: /object/testfiles/dwarf/base.cpp:24

‎testoutput/flags/base-aipf

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
0x0000000000001060: main at /object/testfiles/dwarf/base.cpp:26
2+
0x0000000000001068: main at /object/testfiles/dwarf/base.cpp:26
3+
0x000000000000106a: main at /object/testfiles/dwarf/base.cpp:26
4+
0x000000000000107a: main at /object/testfiles/dwarf/base.cpp:28
5+
0x000000000000107f: main at /object/testfiles/dwarf/base.cpp:28
6+
0x0000000000001084: main at /object/testfiles/dwarf/base.cpp:30
7+
0x0000000000001190: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:12
8+
0x0000000000001194: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:14
9+
0x00000000000011b0: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
10+
0x00000000000011b3: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
11+
0x00000000000011b7: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
12+
0x00000000000011bb: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:14
13+
0x00000000000011c0: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:16
14+
0x00000000000011d0: _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:19
15+
0x00000000000011d4: _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:20
16+
0x0000000000001200: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
17+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:21
18+
0x0000000000001203: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
19+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:21
20+
0x0000000000001207: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
21+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:21
22+
0x000000000000120b: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:14
23+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:21
24+
0x0000000000001230: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
25+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:23
26+
0x0000000000001233: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
27+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:23
28+
0x0000000000001237: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:15
29+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:23
30+
0x000000000000123b: _ZN3Foo3barEPKc at /object/testfiles/dwarf/base.cpp:14
31+
(inlined by) _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:23
32+
0x0000000000001240: _ZN3Foo3fooEi at /object/testfiles/dwarf/base.cpp:24

‎testoutput/flags/base-aips

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
0x0000000000001060: base.cpp:26
2+
0x0000000000001068: base.cpp:26
3+
0x000000000000106a: base.cpp:26
4+
0x000000000000107a: base.cpp:28
5+
0x000000000000107f: base.cpp:28
6+
0x0000000000001084: base.cpp:30
7+
0x0000000000001190: base.cpp:12
8+
0x0000000000001194: base.cpp:14
9+
0x00000000000011b0: base.cpp:15
10+
0x00000000000011b3: base.cpp:15
11+
0x00000000000011b7: base.cpp:15
12+
0x00000000000011bb: base.cpp:14
13+
0x00000000000011c0: base.cpp:16
14+
0x00000000000011d0: base.cpp:19
15+
0x00000000000011d4: base.cpp:20
16+
0x0000000000001200: base.cpp:15
17+
(inlined by) base.cpp:21
18+
0x0000000000001203: base.cpp:15
19+
(inlined by) base.cpp:21
20+
0x0000000000001207: base.cpp:15
21+
(inlined by) base.cpp:21
22+
0x000000000000120b: base.cpp:14
23+
(inlined by) base.cpp:21
24+
0x0000000000001230: base.cpp:15
25+
(inlined by) base.cpp:23
26+
0x0000000000001233: base.cpp:15
27+
(inlined by) base.cpp:23
28+
0x0000000000001237: base.cpp:15
29+
(inlined by) base.cpp:23
30+
0x000000000000123b: base.cpp:14
31+
(inlined by) base.cpp:23
32+
0x0000000000001240: base.cpp:24

0 commit comments

Comments
 (0)