Skip to content
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

Port the 2 rust-lld run-make tests to rmake #123975

Merged
merged 6 commits into from
Apr 17, 2024
Merged

Conversation

lqd
Copy link
Member

@lqd lqd commented Apr 15, 2024

In preparation for finalizing most of the rust-lld work, this PR ports the following tests to rmake:

  • tests/run-make/rust-lld
  • tests/run-make/rust-lld-custom-target

As they use $(CGREP) -e I added regex as an exported dependency to the run_make_support library.

Unfortunately, the most recent versions depend on memchr 2.6.0 but it's currently pinned at 2.5.0 in the workspace, and therefore had to settle for the older regex-1.8.0.

r? @jieyouxu

lqd added 3 commits April 15, 2024 17:23
note: version more recent than 1.8 depend on memchr 2.6, which creates
conflicts as memchr 2.5.0 is pinned elsewhere in the workspace
also check that turning off the linker feature does not use lld
@rustbot 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 15, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 15, 2024

The run-make-support library was changed

cc @jieyouxu

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 run-make tests.

cc @jieyouxu

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me in general, just some nitpicks about introducing some helper methods on the Rustc command wrapper for stable CLI flags (not the unstable ones as I presume they will be changed soon).

tests/run-make/rust-lld/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/rust-lld-custom-target/rmake.rs Outdated Show resolved Hide resolved
lqd added 2 commits April 15, 2024 18:01
also make sure that rust-lld can be disabled via linker features, even
when enabled by default by the target spec
and use it in the `rust-lld` tests
@lqd
Copy link
Member Author

lqd commented Apr 15, 2024

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Apr 15, 2024

📌 Commit af887d3 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 15, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2024
…llaumeGomez

Rollup of 7 pull requests

Successful merges:

 - rust-lang#123673 (Don't ICE for kind mismatches during error rendering)
 - rust-lang#123675 (Taint const qualifs if a static is referenced that didn't pass wfcheck)
 - rust-lang#123975 (Port the 2 `rust-lld` run-make tests to `rmake`)
 - rust-lang#124000 (Use `/* value */` as a placeholder)
 - rust-lang#124013 (Box::into_raw: make Miri understand that this is a box-to-raw cast)
 - rust-lang#124027 (Prefer identity equality over equating types during coercion.)
 - rust-lang#124036 (Remove `default_hidden_visibility: false` from wasm targets)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ec1618c into rust-lang:master Apr 17, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2024
Rollup merge of rust-lang#123975 - lqd:rust-lld-tests, r=jieyouxu

Port the 2 `rust-lld` run-make tests to `rmake`

In preparation for finalizing most of the `rust-lld` work, this PR ports the following tests to `rmake`:
- `tests/run-make/rust-lld`
- `tests/run-make/rust-lld-custom-target`

As they use `$(CGREP) -e` I added `regex` as an exported dependency to the `run_make_support` library.

Unfortunately, the most recent versions depend on `memchr` 2.6.0 but it's currently pinned at 2.5.0 in the workspace, and therefore had to settle for the older `regex-1.8.0`.

r? `@jieyouxu`
@lqd lqd deleted the rust-lld-tests branch April 17, 2024 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants