Skip to content

Commit ce8d757

Browse files
Aaron1011Aaron1011
committed
Bless more test output
1 parent eb94cdd commit ce8d757

File tree

7 files changed

+639
-973
lines changed

7 files changed

+639
-973
lines changed

‎src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@
99

1010
bb0: {
1111
+ Coverage::Counter(0) for /the/src/instrument_coverage.rs:10:11 - 16:2; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6
12-
falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6
12+
falseUnwind -> [real: bb1, cleanup: bb6]; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6
1313
}
1414

1515
bb1: {
1616
StorageLive(_2); // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
17-
_2 = bar() -> [return: bb3, unwind: bb2]; // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
17+
_2 = bar() -> [return: bb2, unwind: bb6]; // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
1818
// mir::Constant
1919
// + span: /the/src/instrument_coverage.rs:12:12: 12:15
2020
// + literal: Const { ty: fn() -> bool {bar}, val: Value(Scalar(<ZST>)) }
2121
}
2222

23-
bb2 (cleanup): {
24-
resume; // scope 0 at /the/src/instrument_coverage.rs:10:1: 16:2
23+
bb2: {
24+
FakeRead(ForMatchedPlace, _2); // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
25+
switchInt(_2) -> [false: bb4, otherwise: bb3]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10
2526
}
2627

2728
bb3: {
28-
FakeRead(ForMatchedPlace, _2); // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
29-
switchInt(_2) -> [false: bb5, otherwise: bb4]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10
29+
falseEdge -> [real: bb5, imaginary: bb4]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10
3030
}
3131

3232
bb4: {
33-
falseEdge -> [real: bb6, imaginary: bb5]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10
34-
}
35-
36-
bb5: {
3733
_1 = const (); // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10
3834
StorageDead(_2); // scope 0 at /the/src/instrument_coverage.rs:15:5: 15:6
3935
goto -> bb0; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6
4036
}
4137

42-
bb6: {
38+
bb5: {
4339
_0 = const (); // scope 0 at /the/src/instrument_coverage.rs:13:13: 13:18
4440
StorageDead(_2); // scope 0 at /the/src/instrument_coverage.rs:15:5: 15:6
4541
return; // scope 0 at /the/src/instrument_coverage.rs:16:2: 16:2
4642
}
43+
44+
bb6 (cleanup): {
45+
resume; // scope 0 at /the/src/instrument_coverage.rs:10:1: 16:2
46+
}
4747
}
4848

‎src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.coverage_of_if_else.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
"percent": 100
1717
},
1818
"lines": {
19-
"count": 46,
19+
"count": 40,
2020
"covered": 19,
21-
"percent": 41.30434782608695
21+
"percent": 47.5
2222
},
2323
"regions": {
24-
"count": 75,
24+
"count": 71,
2525
"covered": 23,
26-
"notcovered": 52,
27-
"percent": 30.666666666666664
26+
"notcovered": 48,
27+
"percent": 32.3943661971831
2828
}
2929
}
3030
}
@@ -41,15 +41,15 @@
4141
"percent": 100
4242
},
4343
"lines": {
44-
"count": 46,
44+
"count": 40,
4545
"covered": 19,
46-
"percent": 41.30434782608695
46+
"percent": 47.5
4747
},
4848
"regions": {
49-
"count": 75,
49+
"count": 71,
5050
"covered": 23,
51-
"notcovered": 52,
52-
"percent": 30.666666666666664
51+
"notcovered": 48,
52+
"percent": 32.3943661971831
5353
}
5454
}
5555
}

‎src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/typical_show_coverage.coverage_of_if_else.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
16| 0| } else {
2121
17| 0| return;
2222
18| 0| }
23-
19| 0|
24-
20| 0| let mut countdown = 0;
23+
19| |
24+
20| | let mut countdown = 0;
2525
21| 2| if true {
2626
^1
2727
22| 2| countdown = 10;
2828
23| 2| }
29-
24| 0|
29+
24| |
3030
25| 2| if countdown > 7 {
3131
^1
3232
26| 2| countdown -= 4;
@@ -40,13 +40,13 @@
4040
32| 0| } else {
4141
33| 0| return;
4242
34| 0| }
43-
35| 0|
44-
36| 0| let mut countdown = 0;
43+
35| |
44+
36| | let mut countdown = 0;
4545
37| 2| if true {
4646
^1
4747
38| 2| countdown = 10;
4848
39| 2| }
49-
40| 0|
49+
40| |
5050
41| 2| if countdown > 7 {
5151
^1
5252
42| 2| countdown -= 4;

‎src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.coverage_of_if_else.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
"percent": 100
1717
},
1818
"lines": {
19-
"count": 46,
19+
"count": 40,
2020
"covered": 19,
21-
"percent": 41.30434782608695
21+
"percent": 47.5
2222
},
2323
"regions": {
24-
"count": 75,
24+
"count": 71,
2525
"covered": 23,
26-
"notcovered": 52,
27-
"percent": 30.666666666666664
26+
"notcovered": 48,
27+
"percent": 32.3943661971831
2828
}
2929
}
3030
}
@@ -41,15 +41,15 @@
4141
"percent": 100
4242
},
4343
"lines": {
44-
"count": 46,
44+
"count": 40,
4545
"covered": 19,
46-
"percent": 41.30434782608695
46+
"percent": 47.5
4747
},
4848
"regions": {
49-
"count": 75,
49+
"count": 71,
5050
"covered": 23,
51-
"notcovered": 52,
52-
"percent": 30.666666666666664
51+
"notcovered": 48,
52+
"percent": 32.3943661971831
5353
}
5454
}
5555
}

‎src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/typical_show_coverage.coverage_of_if_else.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
16| 0| } else {
2121
17| 0| return;
2222
18| 0| }
23-
19| 0|
24-
20| 0| let mut countdown = 0;
23+
19| |
24+
20| | let mut countdown = 0;
2525
21| 2| if true {
2626
^1
2727
22| 2| countdown = 10;
2828
23| 2| }
29-
24| 0|
29+
24| |
3030
25| 2| if countdown > 7 {
3131
^1
3232
26| 2| countdown -= 4;
@@ -40,13 +40,13 @@
4040
32| 0| } else {
4141
33| 0| return;
4242
34| 0| }
43-
35| 0|
44-
36| 0| let mut countdown = 0;
43+
35| |
44+
36| | let mut countdown = 0;
4545
37| 2| if true {
4646
^1
4747
38| 2| countdown = 10;
4848
39| 2| }
49-
40| 0|
49+
40| |
5050
41| 2| if countdown > 7 {
5151
^1
5252
42| 2| countdown -= 4;

0 commit comments

Comments
 (0)