Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format #125421

Oneirical · 2024-05-22T19:58:21Z

Part of #121876 and the associated Google Summer of Code project.

The test which is now called non-pie-thread-local has an unexplained "only-linux" flag. Could it be worth trying to remove it and changing the CI to test non-Linux platforms on it?

rustbot · 2024-05-22T19:58:29Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-05-22T19:58:31Z

Some changes occurred in run-make tests.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

jieyouxu · 2024-05-22T20:29:19Z

tests/run-make/core-no-oom-handling/rmake.rs

+// This test checks that the core library can still compile correctly
+// when the no_global_oom_handling feature is turned on.


Nit: it only tests that compilation succeeds, it does not check for correctness.

I wrote that exact "correctly" terminology in a couple of similar tests to this one, so I have changed them as well. Thanks!

jieyouxu · 2024-05-22T20:31:15Z

tests/run-make/deref-impl-rustdoc-ice/rmake.rs

+// A very specific set of circumstances (mainly, implementing Deref, and
+// having a procedural macro and a Debug derivation in external crates) caused
+// an internal compiler error (ICE) when trying to use rustdoc. This test
+// reproduces the exact circumstances which caused the bug and checks
+// that it does not happen again.


Not-a-review-comment: this is very specific... it must've been a pain to figure out lol

I know, right? I find it especially hilarious that the fix for all this, in the linked PR, is literally just adding a single line of code.

jieyouxu · 2024-05-22T20:34:01Z

One minor nit for a test comment, then r=me after CI is green
@bors delegate+

bors · 2024-05-22T20:34:04Z

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

jieyouxu · 2024-05-22T22:57:38Z

tests/run-make/non-pie-thread-local/rmake.rs

+        .arg("--gc-sections")
+        .arg("-lpthread")
+        .arg("-ldl")
+        .out_exe(tmp_dir().join("foo"))


IIRC out_exe tries to construct the executable path under tmp_dir() already, so you just need to pass the exe name, i.e. "foo" here.

jieyouxu · 2024-05-23T00:17:48Z

Thanks, r=me after CI is green
@bors delegate+ rollup

bors · 2024-05-23T00:17:51Z

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

Oneirical · 2024-05-23T01:15:23Z

cc: error: unrecognized command-line option ‘-Wl’; did you mean ‘-W’?
cc: error: unrecognized command-line option ‘--gc-sections’; did you mean ‘--data-sections’?

Well, that's an unexpected error. Here is what I think I understand: there are multiple C compilers, and we want to use GCC, as it is the one that has the -Wl and --gc-sections flags. However, a different compiler was used in the CI, such as Clang?

I also notice how this test has only-linux activated, which may indicate that it wants some specificity.

Is it possible that, in the past where this test was written, the GNU/Linux CI was using GCC by default, and that changed? But then, how could the Makefile version of the test keep passing?

I may need your help on this one.

jieyouxu · 2024-05-23T02:27:36Z

Well, that's an unexpected error. Here is what I think I understand: there are multiple C compilers, and we want to use GCC, as it is the one that has the -Wl and --gc-sections flags. However, a different compiler was used in the CI, such as Clang?

Not quite: clang and gcc has similar CLI interfaces on this one (e.g. https://clang.llvm.org/docs/CommandGuide/clang.html#cmdoption-Wl-args). The catch here is that the cli flag takes the form

$CC -Wl,<args> // <- notice the comma `,` and `<args>` **immediately** after comma, no whitespace

So they're actually taking <args> and forwarding it to the linker...

That is,

$CC -Wl --gc-sections

is different from

$CC -Wl,--gc-sections

lol.

You needed to write .arg("-Wl,--gc-sections") instead of .arg("-Wl").arg("--gc-sections").

Oneirical · 2024-05-23T02:49:48Z

You needed to write .arg("-Wl,--gc-sections") instead of .arg("-Wl").arg("--gc-sections").

I think the run-make House of Horror just claimed a new guest...

Thank you so much for figuring this out, I was digging a serious rabbit hole in obscure documentation...

Well, no victory just yet, let's see what the CI has to say about it.

Oneirical · 2024-05-23T03:45:42Z

@bors r=@jieyouxu

bors · 2024-05-23T03:45:45Z

📌 Commit 1f17e27 has been approved by jieyouxu

It is now in the queue for this repository.

…=jieyouxu Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). The test which is now called `non-pie-thread-local` has an unexplained "only-linux" flag. Could it be worth trying to remove it and changing the CI to test non-Linux platforms on it?

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#125165 (Migrate `run-make/pgo-branch-weights` to `rmake`) - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125224 (Migrate `run-make/issue-53964` to `rmake`) - rust-lang#125227 (Migrate `run-make/issue-30063` to `rmake`) - rust-lang#125383 (Rewrite `emit`, `mixing-formats` and `bare-outfile` `run-make` tests in `rmake.rs` format) - rust-lang#125401 (Migrate `run-make/rustdoc-scrape-examples-macros` to `rmake.rs`) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) r? `@ghost` `@rustbot` modify labels: rollup

…=jieyouxu Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). The test which is now called `non-pie-thread-local` has an unexplained "only-linux" flag. Could it be worth trying to remove it and changing the CI to test non-Linux platforms on it?

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125224 (Migrate `run-make/issue-53964` to `rmake`) - rust-lang#125227 (Migrate `run-make/issue-30063` to `rmake`) - rust-lang#125383 (Rewrite `emit`, `mixing-formats` and `bare-outfile` `run-make` tests in `rmake.rs` format) - rust-lang#125401 (Migrate `run-make/rustdoc-scrape-examples-macros` to `rmake.rs`) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) - rust-lang#125438 (Remove unneeded string conversion) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#124297 (Allow coercing functions whose signature differs in opaque types in their defining scope into a shared function pointer type) - rust-lang#124516 (Allow monomorphization time const eval failures if the cause is a type layout issue) - rust-lang#124976 (rustc: Use `tcx.used_crates(())` more) - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) - rust-lang#125438 (Remove unneeded string conversion) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125421 - Oneirical:bundle-them-yet-again, r=jieyouxu Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). The test which is now called `non-pie-thread-local` has an unexplained "only-linux" flag. Could it be worth trying to remove it and changing the CI to test non-Linux platforms on it?

Oneirical added 2 commits May 22, 2024 14:40

Rewrite core-no-oom-handling as rmake.rs

c24d1c7

rewrite and rename issue-24445 to rmake

d4e5426

rustbot assigned jieyouxu May 22, 2024

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 22, 2024

This comment has been minimized.

Sign in to view

Oneirical force-pushed the bundle-them-yet-again branch from 701cb37 to 670e401 Compare May 22, 2024 20:06

jieyouxu approved these changes May 22, 2024

View reviewed changes

Oneirical force-pushed the bundle-them-yet-again branch from 670e401 to aa9ef5c Compare May 22, 2024 20:40

This comment has been minimized.

Sign in to view

Oneirical force-pushed the bundle-them-yet-again branch from aa9ef5c to 1676d84 Compare May 22, 2024 22:04

This comment has been minimized.

Sign in to view

jieyouxu reviewed May 22, 2024

View reviewed changes

Oneirical force-pushed the bundle-them-yet-again branch from 844a2bc to 33f08fa Compare May 22, 2024 23:42

jieyouxu approved these changes May 23, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Rewrite and rename issue-38237 to rmake

1f17e27

Oneirical force-pushed the bundle-them-yet-again branch from 33f08fa to 1f17e27 Compare May 23, 2024 02:49

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 23, 2024

matthiaskrgr mentioned this pull request May 23, 2024

Rollup of 9 pull requests #125437

Closed

matthiaskrgr mentioned this pull request May 23, 2024

Rollup of 9 pull requests #125444

Closed

matthiaskrgr mentioned this pull request May 23, 2024

Rollup of 8 pull requests #125448

Merged

bors merged commit eb1b9b0 into rust-lang:master May 23, 2024
6 checks passed

rustbot added this to the 1.80.0 milestone May 23, 2024

Oneirical deleted the bundle-them-yet-again branch May 23, 2024 19:08

jieyouxu mentioned this pull request Jun 9, 2024

Tracking Issue for porting run-make tests to use Rust #121876

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format #125421

Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format #125421

Oneirical commented May 22, 2024

rustbot commented May 22, 2024

rustbot commented May 22, 2024

This comment has been minimized.

jieyouxu May 22, 2024

Oneirical May 22, 2024

jieyouxu May 22, 2024

Oneirical May 22, 2024

jieyouxu commented May 22, 2024

bors commented May 22, 2024

This comment has been minimized.

This comment has been minimized.

jieyouxu May 22, 2024

jieyouxu commented May 23, 2024

bors commented May 23, 2024

This comment has been minimized.

Oneirical commented May 23, 2024

jieyouxu commented May 23, 2024 •

edited

Loading

Oneirical commented May 23, 2024 •

edited

Loading

Oneirical commented May 23, 2024

bors commented May 23, 2024

		// This test checks that the core library can still compile correctly
		// when the no_global_oom_handling feature is turned on.

Rewrite core-no-oom-handling, issue-24445 and issue-38237 run-make tests to new rmake.rs format #125421

Rewrite core-no-oom-handling, issue-24445 and issue-38237 run-make tests to new rmake.rs format #125421

Conversation

Oneirical commented May 22, 2024

rustbot commented May 22, 2024

rustbot commented May 22, 2024

This comment has been minimized.

jieyouxu May 22, 2024

Choose a reason for hiding this comment

Oneirical May 22, 2024

Choose a reason for hiding this comment

jieyouxu May 22, 2024

Choose a reason for hiding this comment

Oneirical May 22, 2024

Choose a reason for hiding this comment

jieyouxu commented May 22, 2024

bors commented May 22, 2024

This comment has been minimized.

This comment has been minimized.

jieyouxu May 22, 2024

Choose a reason for hiding this comment

jieyouxu commented May 23, 2024

bors commented May 23, 2024

This comment has been minimized.

Oneirical commented May 23, 2024

jieyouxu commented May 23, 2024 • edited Loading

Oneirical commented May 23, 2024 • edited Loading

Oneirical commented May 23, 2024

bors commented May 23, 2024

Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format #125421

Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format #125421

jieyouxu commented May 23, 2024 •

edited

Loading

Oneirical commented May 23, 2024 •

edited

Loading