Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit be989ac

Browse files
committedMar 17, 2016
Auto merge of #32263 - frewsxcv:compiletest-ignored-expected, r=nikomatsakis
Stop ignoring expected note/help messages in compiletest suite. Original issue: #21195 Relevant PR: #30778 Prior to this commit, if a compiletest testcase included the text "HELP:" or "NOTE:" (note the colons), then it would indicate to the compiletest suite that we should verify "help" and "note" expected messages. This commit updates this check to also check "HELP" and "NOTE" (not the absense of colons) so that we always verify "help" and "note" expected messages.
2 parents abb1515 + abd1cea commit be989ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+141
-6
lines changed
 

‎src/compiletest/runtest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,8 +1013,8 @@ fn check_expected_errors(revision: Option<&str>,
10131013
expected_errors.iter()
10141014
.fold((false, false),
10151015
|(acc_help, acc_note), ee|
1016-
(acc_help || ee.kind == "help:", acc_note ||
1017-
ee.kind == "note:"));
1016+
(acc_help || ee.kind == "help:" || ee.kind == "help",
1017+
acc_note || ee.kind == "note:" || ee.kind == "note"));
10181018

10191019
// Scan and extract our error/warning messages,
10201020
// which look like:

‎src/test/compile-fail/asm-out-assign-imm.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub fn main() {
2323
unsafe {
2424
asm!("mov $1, $0" : "=r"(x) : "r"(5));
2525
//~^ ERROR re-assignment of immutable variable `x`
26+
//~| NOTE in this expansion of asm!
2627
}
2728
foo(x);
2829
}

0 commit comments

Comments
 (0)