Skip to content

Commit 974f580

Browse files
authored
Rollup merge of rust-lang#128787 - Oneirical:infohazardous-deprogram, r=jieyouxu
Coalesce `dep-info`, `dep-info-spaces` and `dep-info-doesnt-run-much` `run-make` tests into `dep-info` rmake.rs Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). This is one of the most ancient tests in the `run-make` directory and its Makefile does some unexpected things, like creating and deleting a `done` directory over and over, sleeping at certain times (this is the [commit](rust-lang@0d9fd8e) that added the `sleep`). I tried to preserve the intent of the test, which is smoke-testing that `dep-info` works. try-job: x86_64-msvc try-job: i686-mingw try-job: aarch64-gnu try-job: aarch64-apple try-job: test-various try-job: armhf-gnu try-job: dist-various-1
2 parents d2b5aa6 + 7c4d561 commit 974f580

File tree

11 files changed

+37
-66
lines changed

11 files changed

+37
-66
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
run-make/branch-protection-check-IBT/Makefile
22
run-make/cat-and-grep-sanity-check/Makefile
3-
run-make/dep-info-doesnt-run-much/Makefile
4-
run-make/dep-info-spaces/Makefile
5-
run-make/dep-info/Makefile
63
run-make/emit-to-stdout/Makefile
74
run-make/extern-fn-reachable/Makefile
85
run-make/incr-add-rust-src-component/Makefile

tests/run-make/dep-info-doesnt-run-much/Makefile

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/run-make/dep-info-spaces/Makefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/run-make/dep-info-spaces/Makefile.foo

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/run-make/dep-info-spaces/bar.rs

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/run-make/dep-info/Makefile

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/run-make/dep-info/Makefile.foo

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)