Port repr128-dwarf run-make test to rmake by beetrees · Pull Request #124280 · rust-lang/rust

beetrees · 2024-04-23T06:00:13Z

This PR ports the repr128-dwarf run-make test to rmake, using the gimli crate instead of the llvm-dwarfdump command.

Note that this PR changes rmake.rs files to be compiled with the 2021 edition (previously no edition was passed to rustc, meaning they were compiled with the 2015 edition). This means that panic!("{variable}") will now work as expected in rmake.rs files (there's already a usage in the wasm-symbols-not-exported test that this will fix).

Tracking issue: #121876

rustbot · 2024-04-23T06:00:21Z

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-04-23T06:00:23Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in src/tools/compiletest

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

tests/run-make/repr128-dwarf/rmake.rs

jieyouxu

The changes look good to me in general, only thing is I'm not 100% sure if we want to make every rmake.rs be edition 2021 by default. I think we can experiment with edition 2021 by default, and revert / check that individual rmake.rs can override with //@ edition: 2015 if for some reason an earlier edition is required.

jieyouxu · 2024-04-23T10:36:59Z

src/tools/compiletest/src/runtest.rs

            .arg(format!("-Ldependency={}", &support_lib_deps_deps.to_string_lossy()))
            .arg("--extern")
            .arg(format!("run_make_support={}", &support_lib_path.to_string_lossy()))
+            .arg("--edition=2021")


Hmm, do we want to force edition 2021 for every rmake test?

I don't see why not. The rmake test files are “developer-facing” after all unlike the Rust files found in e.g. tests/ui. They are test runners, not “test subjects”. Lol, lacking the proper words rn. Similarly, compiler/ / rustc_* crates all default to Rust 2021.

Make sense yeah, I was just wondering if where was any weird edge cases I have not considered

jieyouxu · 2024-04-23T10:41:53Z

Thanks for the PR!

@bors r+

bors · 2024-04-23T10:41:55Z

📌 Commit 8c64a56 has been approved by jieyouxu

It is now in the queue for this repository.

…youxu Port repr128-dwarf run-make test to rmake This PR ports the repr128-dwarf run-make test to rmake, using the `gimli` crate instead of the `llvm-dwarfdump` command. Note that this PR changes `rmake.rs` files to be compiled with the 2021 edition (previously no edition was passed to `rustc`, meaning they were compiled with the 2015 edition). This means that `panic!("{variable}")` will now work as expected in `rmake.rs` files (there's already a usage in the [wasm-symbols-not-exported test](https://github.com/rust-lang/rust/blob/aca749eefceaed0cda19a7ec5e472fce9387bc00/tests/run-make/wasm-symbols-not-exported/rmake.rs#L34) that this will fix). Tracking issue: rust-lang#121876

Rollup of 6 pull requests Successful merges: - rust-lang#122500 (delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions) - rust-lang#123316 (Test `#[unix_sigpipe = "inherit"]` with both `SIG_DFL` and `SIG_IGN`) - rust-lang#124136 (Provide more context and suggestions in borrowck errors involving closures) - rust-lang#124280 (Port repr128-dwarf run-make test to rmake) - rust-lang#124282 (windows fill_utf16_buf: explain the expected return value) - rust-lang#124308 (Add diagnostic item for `std::iter::Enumerate`) r? `@ghost` `@rustbot` modify labels: rollup

fmease · 2024-04-24T11:32:54Z

Failed in rollup: #124316 (comment)
@bors r-

beetrees · 2024-04-30T17:08:27Z

I've fixed the test to handle Mach-O's split debuginfo.

@rustbot review

jieyouxu · 2024-04-30T18:29:22Z

Thanks!

@bors r+ rollup

bors · 2024-04-30T18:29:25Z

📌 Commit c2fd6ed has been approved by jieyouxu

It is now in the queue for this repository.

Rollup of 4 pull requests Successful merges: - rust-lang#124280 (Port repr128-dwarf run-make test to rmake) - rust-lang#124299 (Add test for issue 106269) - rust-lang#124553 (Write `git-commit-{sha,info}` for Cargo in source tarballs) - rust-lang#124561 (Add `normalize()` in run-make `Diff` type) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#124280 - beetrees:repr128-test-rmake, r=jieyouxu Port repr128-dwarf run-make test to rmake This PR ports the repr128-dwarf run-make test to rmake, using the `gimli` crate instead of the `llvm-dwarfdump` command. Note that this PR changes `rmake.rs` files to be compiled with the 2021 edition (previously no edition was passed to `rustc`, meaning they were compiled with the 2015 edition). This means that `panic!("{variable}")` will now work as expected in `rmake.rs` files (there's already a usage in the [wasm-symbols-not-exported test](https://github.com/rust-lang/rust/blob/aca749eefceaed0cda19a7ec5e472fce9387bc00/tests/run-make/wasm-symbols-not-exported/rmake.rs#L34) that this will fix). Tracking issue: rust-lang#121876

rustbot assigned jieyouxu Apr 23, 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 Apr 23, 2024

Noratrieb reviewed Apr 23, 2024

View reviewed changes

tests/run-make/repr128-dwarf/rmake.rs Show resolved Hide resolved

jieyouxu approved these changes Apr 23, 2024

View reviewed changes

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

fmease mentioned this pull request Apr 24, 2024

Rollup of 6 pull requests #124316

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 24, 2024

Port repr128-dwarf run-make test to rmake

c2fd6ed

beetrees force-pushed the repr128-test-rmake branch from 8c64a56 to c2fd6ed Compare April 30, 2024 17:06

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

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 Apr 30, 2024

jieyouxu mentioned this pull request Apr 30, 2024

Rollup of 4 pull requests #124564

Merged

bors merged commit ce18639 into rust-lang:master Apr 30, 2024

rustbot added this to the 1.80.0 milestone Apr 30, 2024

beetrees deleted the repr128-test-rmake branch April 30, 2024 21:34

fmease mentioned this pull request May 2, 2024

Cleanup: Rid the rmake test runners of extern crate run_make_support; #124622

Merged

jieyouxu mentioned this pull request Jun 9, 2024

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

Closed

Uh oh!

Conversation

beetrees commented Apr 23, 2024

Uh oh!

rustbot commented Apr 23, 2024

Uh oh!

rustbot commented Apr 23, 2024

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu Apr 23, 2024

Choose a reason for hiding this comment

Uh oh!

fmease Apr 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Apr 23, 2024

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Apr 23, 2024

Uh oh!

bors commented Apr 23, 2024

Uh oh!

fmease commented Apr 24, 2024

Uh oh!

beetrees commented Apr 30, 2024

Uh oh!

jieyouxu commented Apr 30, 2024

Uh oh!

bors commented Apr 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fmease Apr 23, 2024 •

edited

Loading