Port the 2 rust-lld run-make tests to rmake#123975
Merged
bors merged 6 commits intorust-lang:masterfrom Apr 17, 2024
Merged
Conversation
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
added
A-testsuite
Collaborator
|
The run-make-support library was changed cc @jieyouxu These commits modify the If this was unintentional then you should revert the changes before this PR is merged. Some changes occurred in run-make tests. cc @jieyouxu Some changes occurred in src/tools/compiletest cc @jieyouxu |
jieyouxu
approved these changes
Apr 15, 2024
Member
jieyouxu
left a comment
jieyouxu
left a comment
There was a problem hiding this comment.
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).
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
Member
Author
|
@bors r=jieyouxu |
Collaborator
bors
added
S-waiting-on-bors
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
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`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In preparation for finalizing most of the
rust-lldwork, this PR ports the following tests tormake:tests/run-make/rust-lldtests/run-make/rust-lld-custom-targetAs they use
$(CGREP) -eI addedregexas an exported dependency to therun_make_supportlibrary.Unfortunately, the most recent versions depend on
memchr2.6.0 but it's currently pinned at 2.5.0 in the workspace, and therefore had to settle for the olderregex-1.8.0.r? @jieyouxu