Skip to content

Rollup of 9 pull requests #85022

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

Merged
merged 20 commits into from
May 7, 2021
Merged
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d95a6cf
Add support for --test-args to cargotest
jyn514 May 1, 2021
3b4b1ea
Don't check bootstrap artifacts by default
jyn514 May 1, 2021
50c3890
bump deps
klensy May 1, 2021
aa68ec2
Retry clang+llvm download
Mark-Simulacrum May 4, 2021
abdba81
use CheckInAllocMsg::PointerArithmeticTest for ptr_offset error
RalfJung May 5, 2021
bcf622b
32bit bless
RalfJung May 6, 2021
cdbfea5
Sort rustdoc-gui tests
GuillaumeGomez May 6, 2021
cb70221
Coverage instruments closure bodies in macros (not the macro body)
richkadel May 4, 2021
f58a362
Update coverage docs and command line help
richkadel May 3, 2021
8075b28
Renamed compiler-flags file to name of compiler-flag: instrument-cove…
richkadel May 6, 2021
cd3a8c1
Removes unneeded check of `#[no_coverage]` in mapgen
richkadel May 3, 2021
2d496f4
Rollup merge of #84779 - jyn514:cargotest-args, r=Mark-Simulacrum
JohnTitor May 7, 2021
1224e13
Rollup merge of #84781 - jyn514:check-bootstrap, r=Mark-Simulacrum
JohnTitor May 7, 2021
246e8d1
Rollup merge of #84787 - klensy:deps-bump, r=Mark-Simulacrum
JohnTitor May 7, 2021
283ef86
Rollup merge of #84815 - richkadel:coverage-docs-update-2021-05, r=tm…
JohnTitor May 7, 2021
b088318
Rollup merge of #84875 - richkadel:no-coverage-dont-check-unused, r=t…
JohnTitor May 7, 2021
343a094
Rollup merge of #84897 - richkadel:cover-closure-macros, r=tmandry
JohnTitor May 7, 2021
326fec2
Rollup merge of #84911 - Mark-Simulacrum:retry-clang, r=pietroalbini
JohnTitor May 7, 2021
4705027
Rollup merge of #84972 - RalfJung:null-ptr-msg, r=oli-obk
JohnTitor May 7, 2021
87faf2e
Rollup merge of #84990 - GuillaumeGomez:sort-rustdoc-gui-tests, r=Mar…
JohnTitor May 7, 2021
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
7 changes: 6 additions & 1 deletion src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ impl Step for RustdocGUI {
command.arg("src/test/rustdoc-gui/lib.rs").arg("-o").arg(&out_dir);
builder.run(&mut command);

let mut tests = Vec::new();
for file in fs::read_dir("src/test/rustdoc-gui").unwrap() {
let file = file.unwrap();
let file_path = file.path();
Expand All @@ -839,13 +840,17 @@ impl Step for RustdocGUI {
if !file_name.to_str().unwrap().ends_with(".goml") {
continue;
}
tests.push(file_path);
}
tests.sort_unstable();
for test in tests {
let mut command = Command::new(&nodejs);
command
.arg("src/tools/rustdoc-gui/tester.js")
.arg("--doc-folder")
.arg(out_dir.join("test_docs"))
.arg("--test-file")
.arg(file_path);
.arg(test);
builder.run(&mut command);
}
} else {
Expand Down