Skip to content

Migrate run-make/rustdoc-scrape-examples-test to new rmake.rs #125275

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 19, 2024
+11 −11
Merged

Migrate run-make/rustdoc-scrape-examples-test to new rmake.rs #125275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
View file
Original file line number Diff line number Diff line change
@@ -236,7 +236,6 @@ run-make/rustc-macro-dep-files/Makefile
run-make/rustdoc-io-error/Makefile
run-make/rustdoc-scrape-examples-macros/Makefile
run-make/rustdoc-scrape-examples-multiple/Makefile
run-make/rustdoc-scrape-examples-test/Makefile
run-make/rustdoc-scrape-examples-whitespace/Makefile
run-make/rustdoc-verify-output-files/Makefile
run-make/rustdoc-with-output-option/Makefile
2 changes: 1 addition & 1 deletion tests/run-make/rustdoc-scrape-examples-invalid-expr/rmake.rs
View file
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
mod scrape;

fn main() {
scrape::scrape();
scrape::scrape(&[]);
}
2 changes: 1 addition & 1 deletion tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs
View file
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
mod scrape;

fn main() {
scrape::scrape();
scrape::scrape(&[]);
}
2 changes: 1 addition & 1 deletion tests/run-make/rustdoc-scrape-examples-remap/rmake.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod scrape;

fn main() {
scrape::scrape();
scrape::scrape(&[]);
}
3 changes: 2 additions & 1 deletion tests/run-make/rustdoc-scrape-examples-remap/scrape.rs
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ use run_make_support::{htmldocck, rustc, rustdoc, source_path, tmp_dir};
use std::fs::read_dir;
use std::path::Path;

pub fn scrape() {
pub fn scrape(extra_args: &[&str]) {
let lib_dir = tmp_dir();
let out_dir = tmp_dir().join("rustdoc");
let crate_name = "foobar";
@@ -29,6 +29,7 @@ pub fn scrape() {
.arg(&out_example)
.arg("--scrape-examples-target-crate")
.arg(crate_name)
.args(extra_args)
.run();
out_deps.push(out_example);
}
6 changes: 0 additions & 6 deletions tests/run-make/rustdoc-scrape-examples-test/Makefile
View file

This file was deleted.

6 changes: 6 additions & 0 deletions tests/run-make/rustdoc-scrape-examples-test/rmake.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
mod scrape;

fn main() {
scrape::scrape(&["--scrape-tests"]);
}