Skip to content

Rollup of 10 pull requests #129140

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

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b18c7d8
Docs for Waker and LocalWaker: Add cross-refs in comment
ijackson Jul 22, 2024
c404406
LocalWaker docs: Make long-ago omitted but probably intended changes
ijackson Jul 22, 2024
2e7e619
bootstrap: fix trying to modify file times on read-only file on Windows
jieyouxu Aug 11, 2024
c4aa7a7
Port `run-make/libtest-json` to rmake
Zalathar Aug 13, 2024
fc733a6
Port `run-make/libtest-junit` to rmake
Zalathar Aug 13, 2024
99aad72
Add a comment explaining the return type of `Ty::kind`.
nnethercote Aug 14, 2024
8b990e3
Port the `sysroot-crates-are-unstable` Python script to rmake
Zalathar Aug 14, 2024
2e4d5bb
rewrite rlib-format-packed-bundled-libs to rmake
Oneirical Aug 12, 2024
51628fb
rewrite native-link-modifier-bundle to rmake
Oneirical Aug 12, 2024
9a95573
Add cautionary paragraph about noop wakers.
ijackson Aug 5, 2024
7d99549
crashes: more tests
matthiaskrgr Aug 15, 2024
7bdfa90
Rollup merge of #128064 - ijackson:noop-waker-doc, r=workingjubilee
workingjubilee Aug 16, 2024
4ed9ed3
Rollup merge of #128977 - jieyouxu:writable-file, r=Kobzol
workingjubilee Aug 16, 2024
2f60b7b
Rollup merge of #129018 - Oneirical:nmemonic-artifice, r=jieyouxu
workingjubilee Aug 16, 2024
48af62f
Rollup merge of #129037 - Zalathar:rmake-libtest, r=jieyouxu
workingjubilee Aug 16, 2024
ad5b750
Rollup merge of #129110 - nnethercote:Ty-kind-ret-ty-comment, r=jieyouxu
workingjubilee Aug 16, 2024
19fcd38
Rollup merge of #129111 - Zalathar:python-sysroot, r=jieyouxu
workingjubilee Aug 16, 2024
1853872
Rollup merge of #129135 - matthiaskrgr:ITKEEPSCRASHINGAAAAAAAAHH, r=c…
workingjubilee Aug 16, 2024
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
Prev Previous commit
Next Next commit
Port run-make/libtest-junit to rmake
  • Loading branch information
Zalathar committed Aug 13, 2024
commit fc733a668afe9a16a23a6d249c6d253a08f36ebf
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ run-make/incr-add-rust-src-component/Makefile
run-make/issue-84395-lto-embed-bitcode/Makefile
run-make/jobserver-error/Makefile
run-make/libs-through-symlinks/Makefile
run-make/libtest-junit/Makefile
run-make/libtest-thread-limit/Makefile
run-make/macos-deployment-target/Makefile
run-make/min-global-align/Makefile
Expand Down
20 changes: 0 additions & 20 deletions tests/run-make/libtest-junit/Makefile

This file was deleted.

31 changes: 31 additions & 0 deletions tests/run-make/libtest-junit/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Check libtest's JUnit (XML) output against snapshots.

//@ ignore-cross-compile
//@ needs-unwind (test file contains #[should_panic] test)

use run_make_support::{cmd, diff, python_command, rustc};

fn main() {
rustc().arg("--test").input("f.rs").run();

run_tests(&[], "output-default.xml");
run_tests(&["--show-output"], "output-stdout-success.xml");
}

#[track_caller]
fn run_tests(extra_args: &[&str], expected_file: &str) {
let cmd_out = cmd("./f")
.env("RUST_BACKTRACE", "0")
.args(&["-Zunstable-options", "--test-threads=1", "--format=junit"])
.args(extra_args)
.run_fail();
let test_stdout = &cmd_out.stdout_utf8();

python_command().arg("validate_junit.py").stdin(test_stdout).run();

diff()
.expected_file(expected_file)
.actual_text("stdout", test_stdout)
.normalize(r#"\btime="[0-9.]+""#, r#"time="$$TIME""#)
.run();
}
Loading