@@ -9,13 +9,13 @@ pub fn check(tests_path: &Path, src_path: &Path, bless: bool, bad: &mut bool) {
9
9
let allowed_makefiles = {
10
10
// We use `include!` here which includes the file as Rust syntax because we want to have
11
11
// a comment that discourages people from adding entries to
12
- // `expected_run_make_makefiles .txt` unless *absolutely* necessary.
13
- let allowed_makefiles = include ! ( "expected_run_make_makefiles .txt" ) ;
12
+ // `allowed_run_make_makefiles .txt` unless *absolutely* necessary.
13
+ let allowed_makefiles = include ! ( "allowed_run_make_makefiles .txt" ) ;
14
14
let is_sorted = allowed_makefiles. windows ( 2 ) . all ( |w| w[ 0 ] < w[ 1 ] ) ;
15
15
if !is_sorted && !bless {
16
16
tidy_error ! (
17
17
bad,
18
- "`src/tools/tidy/src/expected_run_make_makefiles .txt` is not in order, likely \
18
+ "`src/tools/tidy/src/allowed_run_make_makefiles .txt` is not in order, likely \
19
19
because you modified it manually, please only update it with command \
20
20
`x test tidy --bless`"
21
21
) ;
@@ -25,7 +25,7 @@ pub fn check(tests_path: &Path, src_path: &Path, bless: bool, bad: &mut bool) {
25
25
if allowed_makefiles_unique. len ( ) != allowed_makefiles. len ( ) {
26
26
tidy_error ! (
27
27
bad,
28
- "`src/tools/tidy/src/expected_run_make_makefiles .txt` contains duplicate entries, \
28
+ "`src/tools/tidy/src/allowed_run_make_makefiles .txt` contains duplicate entries, \
29
29
likely because you modified it manually, please only update it with command \
30
30
`x test tidy --bless`"
31
31
) ;
@@ -54,7 +54,7 @@ pub fn check(tests_path: &Path, src_path: &Path, bless: bool, bad: &mut bool) {
54
54
tidy_error ! (
55
55
bad,
56
56
"found run-make Makefile not permitted in \
57
- `src/tools/tidy/src/expected_run_make_makefiles .txt`, please write new run-make \
57
+ `src/tools/tidy/src/allowed_run_make_makefiles .txt`, please write new run-make \
58
58
tests with `rmake.rs` instead: {}",
59
59
entry. path( ) . display( )
60
60
) ;
@@ -64,7 +64,7 @@ pub fn check(tests_path: &Path, src_path: &Path, bless: bool, bad: &mut bool) {
64
64
65
65
// If there are any expected Makefiles remaining, they were moved or deleted.
66
66
// Our data must remain up to date, so they must be removed from
67
- // `src/tools/tidy/src/expected_run_make_makefiles .txt`.
67
+ // `src/tools/tidy/src/allowed_run_make_makefiles .txt`.
68
68
// This can be done automatically on --bless, or else a tidy error will be issued.
69
69
if bless && !remaining_makefiles. is_empty ( ) {
70
70
let header = r#"/*
@@ -75,8 +75,8 @@ pub fn check(tests_path: &Path, src_path: &Path, bless: bool, bad: &mut bool) {
75
75
[
76
76
"# ;
77
77
let tidy_src = src_path. join ( "tools" ) . join ( "tidy" ) . join ( "src" ) ;
78
- let org_file_path = tidy_src. join ( "expected_run_make_makefiles .txt" ) ;
79
- let temp_file_path = tidy_src. join ( "blessed_expected_run_make_makefiles .txt" ) ;
78
+ let org_file_path = tidy_src. join ( "allowed_run_make_makefiles .txt" ) ;
79
+ let temp_file_path = tidy_src. join ( "blessed_allowed_run_make_makefiles .txt" ) ;
80
80
let mut temp_file = t ! ( File :: create_new( & temp_file_path) ) ;
81
81
t ! ( write!( temp_file, "{}" , header) ) ;
82
82
for file in allowed_makefiles. difference ( & remaining_makefiles) {
@@ -91,7 +91,7 @@ pub fn check(tests_path: &Path, src_path: &Path, bless: bool, bad: &mut bool) {
91
91
tidy_error ! (
92
92
bad,
93
93
"Makefile `{}` no longer exists and should be removed from the exclusions in \
94
- `src/tools/tidy/src/expected_run_make_makefiles .txt`",
94
+ `src/tools/tidy/src/allowed_run_make_makefiles .txt`",
95
95
p. display( )
96
96
) ;
97
97
}
0 commit comments