Rollup merge of #127098 - Oneirical:big-test-party, r=Kobzol,jieyouxu

Migrate `output-type-permutations` `run-make` test to rmake

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

try-job: x86_64-msvc
try-job: armhf-gnu
try-job: aarch64-apple
try-job: test-various
This commit is contained in:
Jubilee 2024-07-05 23:23:35 -07:00 committed by GitHub
commit 02629721ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 552 additions and 150 deletions

View File

@ -266,14 +266,14 @@ pub fn test_while_readonly<P: AsRef<Path>, F: FnOnce() + std::panic::UnwindSafe>
#[track_caller]
pub fn shallow_find_files<P: AsRef<Path>, F: Fn(&PathBuf) -> bool>(
path: P,
closure: F,
filter: F,
) -> Vec<PathBuf> {
let mut matching_files = Vec::new();
for entry in fs_wrapper::read_dir(path) {
let entry = entry.expect("failed to read directory entry.");
let path = entry.path();
if path.is_file() && closure(&path) {
if path.is_file() && filter(&path) {
matching_files.push(path);
}
}
@ -295,6 +295,13 @@ pub fn not_contains<P: AsRef<Path>>(path: P, expected: &str) -> bool {
!path.as_ref().file_name().is_some_and(|name| name.to_str().unwrap().contains(expected))
}
/// Returns true if the filename at `path` is not in `expected`.
pub fn filename_not_in_denylist<P: AsRef<Path>>(path: P, expected: &[String]) -> bool {
path.as_ref()
.file_name()
.is_some_and(|name| !expected.contains(&name.to_str().unwrap().to_owned()))
}
/// Use `cygpath -w` on a path to get a Windows path string back. This assumes that `cygpath` is
/// available on the platform!
#[track_caller]

View File

@ -100,7 +100,6 @@ run-make/no-alloc-shim/Makefile
run-make/no-builtins-attribute/Makefile
run-make/no-duplicate-libs/Makefile
run-make/obey-crate-type-flag/Makefile
run-make/output-type-permutations/Makefile
run-make/panic-abort-eh_frame/Makefile
run-make/pass-linker-flags-flavor/Makefile
run-make/pass-linker-flags-from-dep/Makefile

View File

@ -1,147 +0,0 @@
# ignore-cross-compile
include ../tools.mk
all:
$(RUSTC) foo.rs --crate-type=rlib,dylib,staticlib
$(call REMOVE_RLIBS,bar)
$(call REMOVE_DYLIBS,bar)
rm $(call STATICLIB,bar)
rm -f $(TMPDIR)/{lib,}bar.{dll.exp,dll.lib,pdb,dll.a}
# Check that $(TMPDIR) is empty.
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --crate-type=bin
rm $(TMPDIR)/$(call BIN,bar)
rm -f $(TMPDIR)/bar.pdb
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit=asm,llvm-ir,llvm-bc,obj,link
rm $(TMPDIR)/bar.ll
rm $(TMPDIR)/bar.bc
rm $(TMPDIR)/bar.s
rm $(TMPDIR)/bar.o
rm $(TMPDIR)/$(call BIN,bar)
rm -f $(TMPDIR)/bar.pdb
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit asm -o $(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit asm=$(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit=asm=$(TMPDIR)/foo
rm $(TMPDIR)/foo
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit llvm-bc -o $(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit llvm-bc=$(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit=llvm-bc=$(TMPDIR)/foo
rm $(TMPDIR)/foo
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit llvm-ir -o $(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit llvm-ir=$(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit=llvm-ir=$(TMPDIR)/foo
rm $(TMPDIR)/foo
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit obj -o $(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit obj=$(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --emit=obj=$(TMPDIR)/foo
rm $(TMPDIR)/foo
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit link -o $(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
$(RUSTC) foo.rs --emit link=$(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
$(RUSTC) foo.rs --emit=link=$(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
rm -f $(TMPDIR)/foo.pdb
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --crate-type=rlib -o $(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --crate-type=rlib --emit link=$(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --crate-type=rlib --emit=link=$(TMPDIR)/foo
rm $(TMPDIR)/foo
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --crate-type=dylib -o $(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
$(RUSTC) foo.rs --crate-type=dylib --emit link=$(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
$(RUSTC) foo.rs --crate-type=dylib --emit=link=$(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
rm -f $(TMPDIR)/{lib,}foo.{dll.exp,dll.lib,pdb,dll.a,exe.a}
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ] || (ls -1 $(TMPDIR) && exit 1)
$(RUSTC) foo.rs --crate-type=staticlib -o $(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --crate-type=staticlib --emit link=$(TMPDIR)/foo
rm $(TMPDIR)/foo
$(RUSTC) foo.rs --crate-type=staticlib --emit=link=$(TMPDIR)/foo
rm $(TMPDIR)/foo
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --crate-type=bin -o $(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
$(RUSTC) foo.rs --crate-type=bin --emit link=$(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
$(RUSTC) foo.rs --crate-type=bin --emit=link=$(TMPDIR)/$(call BIN,foo)
rm $(TMPDIR)/$(call BIN,foo)
rm -f $(TMPDIR)/foo.pdb
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit llvm-ir=$(TMPDIR)/ir \
--emit link \
--crate-type=rlib
rm $(TMPDIR)/ir
rm $(TMPDIR)/libbar.rlib
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit asm=$(TMPDIR)/asm \
--emit llvm-ir=$(TMPDIR)/ir \
--emit llvm-bc=$(TMPDIR)/bc \
--emit obj=$(TMPDIR)/obj \
--emit link=$(TMPDIR)/link \
--crate-type=staticlib
rm $(TMPDIR)/asm
rm $(TMPDIR)/ir
rm $(TMPDIR)/bc
rm $(TMPDIR)/obj
rm $(TMPDIR)/link
$(RUSTC) foo.rs --emit=asm=$(TMPDIR)/asm \
--emit llvm-ir=$(TMPDIR)/ir \
--emit=llvm-bc=$(TMPDIR)/bc \
--emit obj=$(TMPDIR)/obj \
--emit=link=$(TMPDIR)/link \
--crate-type=staticlib
rm $(TMPDIR)/asm
rm $(TMPDIR)/ir
rm $(TMPDIR)/bc
rm $(TMPDIR)/obj
rm $(TMPDIR)/link
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
$(RUSTC) foo.rs --emit=asm,llvm-ir,llvm-bc,obj,link --crate-type=staticlib
rm $(TMPDIR)/bar.ll
rm $(TMPDIR)/bar.s
rm $(TMPDIR)/bar.o
rm $(call STATICLIB,bar)
mv $(TMPDIR)/bar.bc $(TMPDIR)/foo.bc
# Don't check that the $(TMPDIR) is empty - we left `foo.bc` for later
# comparison.
$(RUSTC) foo.rs --emit=llvm-bc,link --crate-type=rlib
cmp $(TMPDIR)/foo.bc $(TMPDIR)/bar.bc
rm $(TMPDIR)/bar.bc
rm $(TMPDIR)/foo.bc
$(call REMOVE_RLIBS,bar)
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]

View File

@ -0,0 +1,543 @@
// In 2014, rustc's output flags were reworked to be a lot more modular.
// This test uses these output flags in an expansive variety of combinations
// and syntax styles, checking that compilation is successful and that output
// files are exactly what is expected, no more, no less.
// See https://github.com/rust-lang/rust/pull/12020
use run_make_support::{
bin_name, dynamic_lib_name, filename_not_in_denylist, fs_wrapper, rust_lib_name, rustc,
shallow_find_files, static_lib_name,
};
use std::path::PathBuf;
// Each test takes 4 arguments:
// `must_exist`: output files which must be found - if any are absent, the test fails
// `can_exist`: optional output files which will not trigger a failure
// `dir`: the name of the directory where the test happens
// `rustc_invocation`: the rustc command being tested
// Any unexpected output files not listed in `must_exist` or `can_exist` will cause a failure.
fn assert_expected_output_files(expectations: Expectations, rustc_invocation: impl Fn()) {
let must_exist = expectations.expected_files;
let can_exist = expectations.allowed_files;
let dir = expectations.test_dir;
fs_wrapper::create_dir(&dir);
rustc_invocation();
for file in must_exist {
fs_wrapper::remove_file(PathBuf::from(&dir).join(&file));
}
let actual_output_files =
shallow_find_files(dir, |path| filename_not_in_denylist(path, &can_exist));
if !&actual_output_files.is_empty() {
dbg!(&actual_output_files);
panic!("unexpected output artifacts detected");
}
}
struct Expectations {
/// Output files which must be found. The test fails if any are absent.
expected_files: Vec<String>,
/// Allowed output files which will not trigger a failure.
allowed_files: Vec<String>,
/// Name of the directory where the test happens.
test_dir: String,
}
macro_rules! s {
( $( $x:expr ),* ) => {
{
let mut temp_vec = Vec::new();
$(
temp_vec.push($x.to_string());
)*
temp_vec
}
};
}
fn main() {
let bin_foo = bin_name("foo");
assert_expected_output_files(
Expectations {
expected_files: s![
static_lib_name("bar"),
dynamic_lib_name("bar"),
rust_lib_name("bar")
],
allowed_files: s![
"libbar.dll.exp",
"libbar.dll.lib",
"libbar.pdb",
"libbar.dll.a",
"libbar.exe.a",
"bar.dll.exp",
"bar.dll.lib",
"bar.pdb",
"bar.dll.a",
"bar.exe.a"
],
test_dir: "three-crates".to_string(),
},
|| {
rustc()
.input("foo.rs")
.out_dir("three-crates")
.crate_type("rlib,dylib,staticlib")
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_name("bar")],
allowed_files: s!["bar.pdb"],
test_dir: "bin-crate".to_string(),
},
|| {
rustc().input("foo.rs").crate_type("bin").out_dir("bin-crate").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["bar.ll", "bar.bc", "bar.s", "bar.o", bin_name("bar")],
allowed_files: s!["bar.pdb"],
test_dir: "all-emit".to_string(),
},
|| {
rustc().input("foo.rs").emit("asm,llvm-ir,llvm-bc,obj,link").out_dir("all-emit").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "asm-emit".to_string(),
},
|| {
rustc().input("foo.rs").emit("asm").output("asm-emit/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "asm-emit2".to_string(),
},
|| {
rustc().input("foo.rs").emit("asm=asm-emit2/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "asm-emit3".to_string(),
},
|| {
rustc().input("foo.rs").arg("--emit=asm=asm-emit3/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "llvm-ir-emit".to_string(),
},
|| {
rustc().input("foo.rs").emit("llvm-ir").output("llvm-ir-emit/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "llvm-ir-emit2".to_string(),
},
|| {
rustc().input("foo.rs").emit("llvm-ir=llvm-ir-emit2/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "llvm-ir-emit3".to_string(),
},
|| {
rustc().input("foo.rs").arg("--emit=llvm-ir=llvm-ir-emit3/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "llvm-bc-emit".to_string(),
},
|| {
rustc().input("foo.rs").emit("llvm-bc").output("llvm-bc-emit/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "llvm-bc-emit2".to_string(),
},
|| {
rustc().input("foo.rs").emit("llvm-bc=llvm-bc-emit2/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "llvm-bc-emit3".to_string(),
},
|| {
rustc().input("foo.rs").arg("--emit=llvm-bc=llvm-bc-emit3/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "obj-emit".to_string(),
},
|| {
rustc().input("foo.rs").emit("obj").output("obj-emit/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "obj-emit2".to_string(),
},
|| {
rustc().input("foo.rs").emit("obj=obj-emit2/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "obj-emit3".to_string(),
},
|| {
rustc().input("foo.rs").arg("--emit=obj=obj-emit3/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![&bin_foo],
allowed_files: s!["foo.pdb"],
test_dir: "link-emit".to_string(),
},
|| {
rustc().input("foo.rs").emit("link").output("link-emit/".to_owned() + &bin_foo).run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![&bin_foo],
allowed_files: s!["foo.pdb"],
test_dir: "link-emit2".to_string(),
},
|| {
rustc().input("foo.rs").emit(&format!("link=link-emit2/{bin_foo}")).run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![&bin_foo],
allowed_files: s!["foo.pdb"],
test_dir: "link-emit3".to_string(),
},
|| {
rustc().input("foo.rs").arg(&format!("--emit=link=link-emit3/{bin_foo}")).run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "rlib".to_string(),
},
|| {
rustc().crate_type("rlib").input("foo.rs").output("rlib/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "rlib2".to_string(),
},
|| {
rustc().crate_type("rlib").input("foo.rs").emit("link=rlib2/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "rlib3".to_string(),
},
|| {
rustc().crate_type("rlib").input("foo.rs").arg("--emit=link=rlib3/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_foo],
allowed_files: s![
"libfoo.dll.exp",
"libfoo.dll.lib",
"libfoo.pdb",
"libfoo.dll.a",
"libfoo.exe.a",
"foo.dll.exp",
"foo.dll.lib",
"foo.pdb",
"foo.dll.a",
"foo.exe.a"
],
test_dir: "dylib".to_string(),
},
|| {
rustc()
.crate_type("dylib")
.input("foo.rs")
.output("dylib/".to_owned() + &bin_foo)
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_foo],
allowed_files: s![
"libfoo.dll.exp",
"libfoo.dll.lib",
"libfoo.pdb",
"libfoo.dll.a",
"libfoo.exe.a",
"foo.dll.exp",
"foo.dll.lib",
"foo.pdb",
"foo.dll.a",
"foo.exe.a"
],
test_dir: "dylib2".to_string(),
},
|| {
rustc()
.crate_type("dylib")
.input("foo.rs")
.emit(&format!("link=dylib2/{bin_foo}"))
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_foo],
allowed_files: s![
"libfoo.dll.exp",
"libfoo.dll.lib",
"libfoo.pdb",
"libfoo.dll.a",
"libfoo.exe.a",
"foo.dll.exp",
"foo.dll.lib",
"foo.pdb",
"foo.dll.a",
"foo.exe.a"
],
test_dir: "dylib3".to_string(),
},
|| {
rustc()
.crate_type("dylib")
.input("foo.rs")
.arg(&format!("--emit=link=dylib3/{bin_foo}"))
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "staticlib".to_string(),
},
|| {
rustc().crate_type("staticlib").input("foo.rs").output("staticlib/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "staticlib2".to_string(),
},
|| {
rustc().crate_type("staticlib").input("foo.rs").emit("link=staticlib2/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["foo"],
allowed_files: s![],
test_dir: "staticlib3".to_string(),
},
|| {
rustc().crate_type("staticlib").input("foo.rs").arg("--emit=link=staticlib3/foo").run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_foo],
allowed_files: s!["foo.pdb"],
test_dir: "bincrate".to_string(),
},
|| {
rustc()
.crate_type("bin")
.input("foo.rs")
.output("bincrate/".to_owned() + &bin_foo)
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_foo],
allowed_files: s!["foo.pdb"],
test_dir: "bincrate2".to_string(),
},
|| {
rustc()
.crate_type("bin")
.input("foo.rs")
.emit(&format!("link=bincrate2/{bin_foo}"))
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s![bin_foo],
allowed_files: s!["foo.pdb"],
test_dir: "bincrate3".to_string(),
},
|| {
rustc()
.crate_type("bin")
.input("foo.rs")
.arg(&format!("--emit=link=bincrate3/{bin_foo}"))
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["ir", rust_lib_name("bar")],
allowed_files: s![],
test_dir: "rlib-ir".to_string(),
},
|| {
rustc()
.input("foo.rs")
.emit("llvm-ir=rlib-ir/ir")
.emit("link")
.crate_type("rlib")
.out_dir("rlib-ir")
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["ir", "asm", "bc", "obj", "link"],
allowed_files: s![],
test_dir: "staticlib-all".to_string(),
},
|| {
rustc()
.input("foo.rs")
.emit("asm=staticlib-all/asm")
.emit("llvm-ir=staticlib-all/ir")
.emit("llvm-bc=staticlib-all/bc")
.emit("obj=staticlib-all/obj")
.emit("link=staticlib-all/link")
.crate_type("staticlib")
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["ir", "asm", "bc", "obj", "link"],
allowed_files: s![],
test_dir: "staticlib-all2".to_string(),
},
|| {
rustc()
.input("foo.rs")
.arg("--emit=asm=staticlib-all2/asm")
.arg("--emit")
.arg("llvm-ir=staticlib-all2/ir")
.arg("--emit=llvm-bc=staticlib-all2/bc")
.arg("--emit")
.arg("obj=staticlib-all2/obj")
.arg("--emit=link=staticlib-all2/link")
.crate_type("staticlib")
.run();
},
);
assert_expected_output_files(
Expectations {
expected_files: s!["bar.ll", "bar.s", "bar.o", static_lib_name("bar")],
allowed_files: s!["bar.bc"], // keep this one for the next test
test_dir: "staticlib-all3".to_string(),
},
|| {
rustc()
.input("foo.rs")
.emit("asm,llvm-ir,llvm-bc,obj,link")
.crate_type("staticlib")
.out_dir("staticlib-all3")
.run();
},
);
// the .bc file from the previous test should be equivalent to this one, despite the difference
// in crate type
assert_expected_output_files(
Expectations {
expected_files: s!["bar.bc", rust_lib_name("bar"), "foo.bc"],
allowed_files: s![],
test_dir: "rlib-emits".to_string(),
},
|| {
fs_wrapper::rename("staticlib-all3/bar.bc", "rlib-emits/foo.bc");
rustc()
.input("foo.rs")
.emit("llvm-bc,link")
.crate_type("rlib")
.out_dir("rlib-emits")
.run();
assert_eq!(
fs_wrapper::read("rlib-emits/foo.bc"),
fs_wrapper::read("rlib-emits/bar.bc")
);
},
);
}