Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coalesce dep-info, dep-info-spaces and dep-info-doesnt-run-much run-make tests into dep-info rmake.rs #128787

Merged
merged 1 commit into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
run-make/branch-protection-check-IBT/Makefile
run-make/cat-and-grep-sanity-check/Makefile
run-make/dep-info-doesnt-run-much/Makefile
run-make/dep-info-spaces/Makefile
run-make/dep-info/Makefile
run-make/emit-to-stdout/Makefile
run-make/extern-fn-reachable/Makefile
run-make/incr-add-rust-src-component/Makefile
Expand Down
4 changes: 0 additions & 4 deletions tests/run-make/dep-info-doesnt-run-much/Makefile

This file was deleted.

19 changes: 0 additions & 19 deletions tests/run-make/dep-info-spaces/Makefile

This file was deleted.

7 changes: 0 additions & 7 deletions tests/run-make/dep-info-spaces/Makefile.foo

This file was deleted.

1 change: 0 additions & 1 deletion tests/run-make/dep-info-spaces/bar.rs

This file was deleted.

25 changes: 0 additions & 25 deletions tests/run-make/dep-info/Makefile

This file was deleted.

7 changes: 0 additions & 7 deletions tests/run-make/dep-info/Makefile.foo

This file was deleted.

37 changes: 37 additions & 0 deletions tests/run-make/dep-info/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// This is a simple smoke test for rustc's `--emit dep-info` feature. It prints out
// information about dependencies in a Makefile-compatible format, as a `.d` file.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: we should make it clear that we don't attempt to check the .d file is in fact Makefile-compatible in this test.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rustbot author

// Note that this test does not check that the `.d` file is Makefile-compatible.

// This test first checks that emitting dep-info disables static analysis, preventing
// compilation of `erroneous.rs` from causing a compilation failure.
// Then, it checks that compilation using the flag is successful in general, even with
// empty source files or source files that contain a whitespace character.

// Finally, it removes one dependency and checks that compilation is still successful.
// See https://github.com/rust-lang/rust/pull/10698

use run_make_support::{rfs, rustc};

fn main() {
// We're only emitting dep info, so we shouldn't be running static analysis to
// figure out that this program is erroneous.
rustc().input("erroneous.rs").emit("dep-info").run();

rustc().input("lib.rs").emit("dep-info,link").crate_type("lib").run();
rfs::remove_file("foo.rs");
rfs::create_file("foo.rs");
// Compilation should succeed even if `foo.rs` is empty.
rustc().input("lib.rs").emit("dep-info,link").crate_type("lib").run();

// Again, with a space in the filename this time around.
rustc().input("lib_foofoo.rs").emit("dep-info,link").crate_type("lib").run();
rfs::remove_file("foo foo.rs");
rfs::create_file("foo foo.rs");
// Compilation should succeed even if `foo foo.rs` is empty.
rustc().input("lib_foofoo.rs").emit("dep-info,link").crate_type("lib").run();

// When a source file is deleted, compilation should still succeed if the library
// also loses this source file dependency.
rfs::remove_file("bar.rs");
rustc().input("lib2.rs").emit("dep-info,link").crate_type("lib").run();
}
Loading