Migrate `run-make/rustdoc-io-error` to `rmake.rs` #124807

GuillaumeGomez · 2024-05-06T16:20:07Z

Part of #121876.

r? @jieyouxu

try-job: armhf-gnu

rustbot · 2024-05-06T16:20:15Z

Some changes occurred in run-make tests.

cc @jieyouxu

tests/run-make/rustdoc-io-error/rmake.rs

jieyouxu · 2024-05-08T14:37:34Z

tests/run-make/rustdoc-io-error/rmake.rs

+ permissions.set_readonly(false);
+ fs::set_permissions(&out_dir, permissions).unwrap();
+
+ #[cfg(not(windows))]


Is there a reason assert_eq!(output.status.code().unwrap(), 1); is non-Windows? Basic r/w permissions are available on Windows too right? Does rustdoc behave differently on Windows for a non-modifiable output directory?

Because I couldn't ensure the exact error code value on Windows (I don't have windows) so for now I only check that it fails whatever the OS, and if it's unix, then I check the error code is 1.

You could try editing PR CI to enable some Windows runners in PR CI and see if the error code is the same on Windows

The original test was running fine on Windows so I suppose it's fine to just check the error code whatever the platform.

GuillaumeGomez · 2024-05-08T15:03:27Z

Removed the cfg. As mentioned above, I think it'll be fine since the original test was checking for this error code and was running on windows as well.

jieyouxu · 2024-05-08T15:05:43Z

Removed the cfg. As mentioned above, I think it'll be fine since the original test was checking for this error code and was running on windows as well.

Actually, the original test never ran on Windows 😄

rust/tests/run-make/rustdoc-io-error/Makefile

Line 7 in e3029d2

# ignore-windows

GuillaumeGomez · 2024-05-08T22:12:18Z

Note for myself: should reduce coding while attending conferences. ^^'

Let's make a trybuild to ensure it's ok, and otherwise let's see what windows actually return.

@bors try

bors · 2024-05-08T22:13:29Z

⌛ Trying commit 6a614ad with merge f88ce61...

…ror, r=<try> Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`

bors · 2024-05-08T23:51:14Z

☀️ Try build successful - checks-actions
Build commit: f88ce61 (f88ce618eb7b8dd4bb9a7d3614b26c544d2c10e1)

GuillaumeGomez · 2024-05-09T07:21:44Z

Seems like windows is happy so let's go! :D

@bors r=jieyouxu rollup

bors · 2024-05-09T07:21:47Z

📌 Commit 6a614ad has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-05-09T09:28:07Z

☔ The latest upstream changes (presumably #124916) made this pull request unmergeable. Please resolve the merge conflicts.

GuillaumeGomez · 2024-05-10T08:42:01Z

Rebased.

@bors r=jieyouxu rollup

bors · 2024-05-10T08:42:03Z

📌 Commit ab1a67e has been approved by jieyouxu

It is now in the queue for this repository.

…error, r=jieyouxu Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`

bors · 2024-05-14T20:14:26Z

💔 Test failed - checks-actions

jieyouxu · 2024-05-14T20:35:24Z

The backtrace (lol):

2024-05-14T20:14:03.7056804Z thread 'main' panicked at /checkout/tests/run-make/rustdoc-io-error/rmake.rs:36:9:
2024-05-14T20:14:03.7057384Z Expected status code to be 1, found 0
2024-05-14T20:14:03.7057748Z stack backtrace:
2024-05-14T20:14:03.7058020Z    0: rust_begin_unwind
2024-05-14T20:14:03.7058353Z    1: core::panicking::panic_fmt
2024-05-14T20:14:03.7058686Z    2: rmake::main
2024-05-14T20:14:03.7059011Z    3: core::ops::function::FnOnce::call_once
2024-05-14T20:14:03.7059621Z note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

jieyouxu · 2024-05-14T20:36:47Z

Right, you'll have to set backtrace on Rustdoc's Command I think?

GuillaumeGomez · 2024-05-15T12:51:22Z

Let's put it everywhere. 😈

GuillaumeGomez · 2024-05-15T13:00:19Z

@bors try

bors · 2024-05-15T13:01:30Z

⌛ Trying commit 24580e8 with merge b5c0268...

…ror, r=<try> Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu` try-job: armhf-gnu

bors · 2024-05-15T13:39:44Z

💔 Test failed - checks-actions

GuillaumeGomez · 2024-05-15T14:06:40Z

So there is no other output. It just succeeds at rendering docs in a read-only folder. Dark magic.

GuillaumeGomez · 2024-05-15T14:08:28Z

Seems like I removed some improvements I did to the permissions setting. Should be fixed. Let's see the ICE this time.

@bors try

…ror, r=<try> Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu` try-job: armhf-gnu

bors · 2024-05-15T14:09:40Z

⌛ Trying commit ff47f47 with merge e6d0345...

rust-log-analyzer · 2024-05-15T14:48:14Z

The job armhf-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [run-make] tests/run-make/rustdoc-io-error stdout ----

error: rmake recipe failed to complete
status: exit status: 101
command: cd "/checkout/tests/run-make/rustdoc-io-error" && env -u CARGO_MAKEFLAGS -u MAKEFLAGS -u MFLAGS -u RUSTFLAGS AR="arm-linux-gnueabihf-ar" CC="arm-linux-gnueabihf-gcc" CC_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -march=armv6 -marm -mfpu=vfp" CXX="arm-linux-gnueabihf-g++" CXX_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -march=armv6 -marm -mfpu=vfp" HOST_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck" PYTHON="/usr/bin/python3" REMOTE_TEST_CLIENT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTC_LINKER="arm-linux-gnueabihf-gcc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" RUST_BUILD_STAGE="stage2-arm-unknown-linux-gnueabihf" S="/checkout" TARGET="arm-unknown-linux-gnueabihf" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-unknown-linux-gnueabihf/lib" TARGET_RPATH_ENV="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/rustdoc-io-error/rustdoc-io-error:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" TMPDIR="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/rustdoc-io-error/rustdoc-io-error" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/rustdoc-io-error/rustdoc-io-error/rmake"
--- stderr -------------------------------
=== STDOUT ===

=== STDERR ===

bors · 2024-05-15T14:48:27Z

💔 Test failed - checks-actions

GuillaumeGomez · 2024-05-15T17:00:15Z

Still same outcome. I have no idea what's wrong with this target...

tests/run-make/rustdoc-io-error/rmake.rs

GuillaumeGomez · 2024-05-15T23:21:22Z

rustdoc isn't ICEing, it's the panic/assert from rmake.rs which is.

jieyouxu · 2024-05-16T00:00:30Z

rustdoc isn't ICEing, it's the panic/assert from rmake.rs which is.

I'm a complete idiot, I saw exit status: 101 and immediately assumed something ICE'd. It's actually failing because it's succeeding unexpectedly (lol)

Expected status code to be 1, found 0

jieyouxu · 2024-05-16T00:02:15Z

In that case, I think it's reasonable to change the assertion to not match on exit code == 1, but instead just check that exit code != 101 (for rustdoc's exit code).

GuillaumeGomez · 2024-05-16T13:18:39Z

I'm not sure it will work since we want to ensure rustdoc returned an error, but worth trying I suppose...

bors · 2024-05-18T20:16:28Z

☔ The latest upstream changes (presumably #125254) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot assigned jieyouxu May 6, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 6, 2024

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 7a43b72 to 182fbf7 Compare May 6, 2024 16:20

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 6, 2024

jieyouxu reviewed May 8, 2024

View reviewed changes

tests/run-make/rustdoc-io-error/rmake.rs Show resolved Hide resolved

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 182fbf7 to 74475c9 Compare May 8, 2024 14:11

jieyouxu reviewed May 8, 2024

View reviewed changes

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 74475c9 to 6a614ad Compare May 8, 2024 15:02

bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2024

Auto merge of rust-lang#124807 - GuillaumeGomez:migrate-rustdoc-io-er…

f88ce61

…ror, r=<try> Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 9, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 9, 2024

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 6a614ad to ab1a67e Compare May 10, 2024 08:41

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 10, 2024

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 10, 2024

Rollup merge of rust-lang#124807 - GuillaumeGomez:migrate-rustdoc-io-…

0a5dc82

…error, r=jieyouxu Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`

matthiaskrgr mentioned this pull request May 10, 2024

Rollup of 4 pull requests #124964

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 14, 2024

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from a4ca364 to 24580e8 Compare May 15, 2024 13:00

This comment has been minimized.

Sign in to view

GuillaumeGomez added 3 commits May 15, 2024 16:07

Migrate run-make/rustdoc-io-error to rmake.rs

f3650f9

Display more information if test fails

0f30b55

Add more debug info

ff47f47

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 24580e8 to ff47f47 Compare May 15, 2024 14:08

jieyouxu reviewed May 15, 2024

View reviewed changes

tests/run-make/rustdoc-io-error/rmake.rs Show resolved Hide resolved

This comment was marked as off-topic.

Sign in to view

Migrate run-make/rustdoc-io-error to rmake.rs #124807

Are you sure you want to change the base?

Migrate run-make/rustdoc-io-error to rmake.rs #124807

Conversation

GuillaumeGomez commented May 6, 2024 • edited

rustbot commented May 6, 2024

jieyouxu May 8, 2024

Choose a reason for hiding this comment

GuillaumeGomez May 8, 2024

Choose a reason for hiding this comment

jieyouxu May 8, 2024

Choose a reason for hiding this comment

GuillaumeGomez May 8, 2024

Choose a reason for hiding this comment

GuillaumeGomez commented May 8, 2024

jieyouxu commented May 8, 2024

GuillaumeGomez commented May 8, 2024

bors commented May 8, 2024

bors commented May 8, 2024

GuillaumeGomez commented May 9, 2024

bors commented May 9, 2024

bors commented May 9, 2024

GuillaumeGomez commented May 10, 2024

bors commented May 10, 2024

bors commented May 14, 2024

jieyouxu commented May 14, 2024

jieyouxu commented May 14, 2024

GuillaumeGomez commented May 15, 2024

GuillaumeGomez commented May 15, 2024

bors commented May 15, 2024

This comment has been minimized.

bors commented May 15, 2024

GuillaumeGomez commented May 15, 2024

GuillaumeGomez commented May 15, 2024

bors commented May 15, 2024

rust-log-analyzer commented May 15, 2024

bors commented May 15, 2024

GuillaumeGomez commented May 15, 2024

This comment was marked as off-topic.

GuillaumeGomez commented May 15, 2024

jieyouxu commented May 16, 2024

jieyouxu commented May 16, 2024

GuillaumeGomez commented May 16, 2024

bors commented May 18, 2024

Migrate `run-make/rustdoc-io-error` to `rmake.rs` #124807

Migrate `run-make/rustdoc-io-error` to `rmake.rs` #124807

GuillaumeGomez commented May 6, 2024 •

edited