Skip to content

Commit 61a6afe

Browse files
committed
Rewrite and rename issue-35164 to rmake
1 parent 83234a0 commit 61a6afe

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

src/tools/run-make-support/src/command.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl CompletedProcess {
216216
/// Checks that `stderr` does not contain `unexpected`.
217217
#[track_caller]
218218
pub fn assert_stderr_not_contains<S: AsRef<str>>(&self, unexpected: S) -> &Self {
219-
assert_not_contains(&self.stdout_utf8(), unexpected);
219+
assert_not_contains(&self.stderr_utf8(), unexpected);
220220
self
221221
}
222222

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ run-make/foreign-double-unwind/Makefile
1717
run-make/foreign-exceptions/Makefile
1818
run-make/foreign-rust-exceptions/Makefile
1919
run-make/incr-add-rust-src-component/Makefile
20-
run-make/issue-35164/Makefile
2120
run-make/issue-36710/Makefile
2221
run-make/issue-69368/Makefile
2322
run-make/issue-84395-lto-embed-bitcode/Makefile

tests/run-make/issue-35164/Makefile

-4
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// The byte positions in json format error logging used to have a small, difficult
2+
// to predict offset. This was changed to be the top of the file every time in #42973,
3+
// and this test checks that the measurements appearing in the standard error are correct.
4+
// See https://github.com/rust-lang/rust/issues/35164
5+
6+
use run_make_support::rustc;
7+
8+
fn main() {
9+
rustc()
10+
.input("main.rs")
11+
.error_format("json")
12+
.run()
13+
.assert_stderr_contains(r#""byte_start":23"#)
14+
.assert_stderr_contains(r#""byte_end":29"#);
15+
}

0 commit comments

Comments
 (0)