bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Migrate run-make/rustdoc-target-spec-json-path to rmake

Browse source
This commit is contained in:
Guillaume Gomez 2024-05-13 15:04:36 +02:00
parent 4057a7b1e3
commit b515de83af
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View file

@ -251,7 +251,6 @@ run-make/rustdoc-scrape-examples-multiple/Makefile
run-make/rustdoc-scrape-examples-remap/Makefile run-make/rustdoc-scrape-examples-remap/Makefile
run-make/rustdoc-scrape-examples-test/Makefile run-make/rustdoc-scrape-examples-test/Makefile
run-make/rustdoc-scrape-examples-whitespace/Makefile run-make/rustdoc-scrape-examples-whitespace/Makefile
run-make/rustdoc-target-spec-json-path/Makefile
run-make/rustdoc-themes/Makefile run-make/rustdoc-themes/Makefile
run-make/rustdoc-verify-output-files/Makefile run-make/rustdoc-verify-output-files/Makefile
run-make/rustdoc-with-out-dir-option/Makefile run-make/rustdoc-with-out-dir-option/Makefile

9
tests/run-make/rustdoc-target-spec-json-path/Makefile
View file

@ -1,9 +0,0 @@
include ../tools.mk
# Test that rustdoc will properly canonicalize the target spec json path just like rustc
OUTPUT_DIR := "$(TMPDIR)/rustdoc-target-spec-json-path"
all:
$(RUSTC) --crate-type lib dummy_core.rs --target target.json
$(RUSTDOC) -o $(OUTPUT_DIR) -L $(TMPDIR) my_crate.rs --target target.json

14
tests/run-make/rustdoc-target-spec-json-path/rmake.rs Normal file
View file

@ -0,0 +1,14 @@
// Test that rustdoc will properly canonicalize the target spec json path just like rustc.
use run_make_support::{rustc, rustdoc, tmp_dir};
fn main() {
let out_dir = tmp_dir().join("rustdoc-target-spec-json-path");
rustc().crate_type("lib").input("dummy_core.rs").target("target.json").run();
rustdoc()
.input("my_crate.rs")
.output(out_dir)
.library_search_path(tmp_dir())
.target("target.json")
.run();
}