Skip to content

Commit

Permalink
Rollup merge of #125218 - Oneirical:easy-test-the-third, r=jieyouxu
Browse files Browse the repository at this point in the history
Migrate `run-make/no-intermediate-extras` to new `rmake.rs`

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
  • Loading branch information
matthiaskrgr committed May 21, 2024
2 parents 4abf179 + 95c47d3 commit 7ef533b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ run-make/no-alloc-shim/Makefile
run-make/no-builtins-attribute/Makefile
run-make/no-builtins-lto/Makefile
run-make/no-duplicate-libs/Makefile
run-make/no-intermediate-extras/Makefile
run-make/obey-crate-type-flag/Makefile
run-make/optimization-remarks-dir-pgo/Makefile
run-make/optimization-remarks-dir/Makefile
Expand Down
8 changes: 0 additions & 8 deletions tests/run-make/no-intermediate-extras/Makefile

This file was deleted.

17 changes: 17 additions & 0 deletions tests/run-make/no-intermediate-extras/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// When using the --test flag with an rlib, this used to generate
// an unwanted .bc file, which should not exist. This test checks
// that the bug causing the generation of this file has not returned.
// See https://github.com/rust-lang/rust/issues/10973

//@ ignore-cross-compile

use run_make_support::{rustc, tmp_dir};
use std::fs;

fn main() {
rustc().crate_type("rlib").arg("--test").input("foo.rs").run();
assert!(
fs::remove_file(tmp_dir().join("foo.bc")).is_err(),
"An unwanted .bc file was created by run-make/no-intermediate-extras."
);
}

0 comments on commit 7ef533b

Please sign in to comment.