test: Add a min-llvm-version directive #36198
Merged
+33
−2
Conversation
This file contains 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
|
r? @brson |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
(note that this should hold off on r+ until we confirm travis is green) |
|
https://travis-ci.org/rust-lang/rust/builds/156884048#L7287 🎊 |
| .expect("Malformed llvm version directive"); | ||
| // Ignore if actual version is smaller the minimum required | ||
| // version | ||
| &actual_version[..] < min_version |
There was a problem hiding this comment.
Won't this fail for something like llvm version 3.10?
There was a problem hiding this comment.
But LLVM 3.9 is going to be followed by 4.0 so maybe it doesn't matter.
|
@bors r+ |
|
📌 Commit 82b57ed has been approved by |
| @@ -148,6 +148,8 @@ pub fn compiletest(build: &Build, | |||
| if let Some(ref dir) = build.lldb_python_dir { | |||
| cmd.arg("--lldb-python-dir").arg(dir); | |||
| } | |||
| let llvm_version = output(Command::new(&llvm_config).arg("--version")); | |||
There was a problem hiding this comment.
Should this be build.llvm_config?
There was a problem hiding this comment.
Regardless of what it should be, llvm_config is undefined at this point:
error[E0425]: unresolved name `llvm_config`
--> src/bootstrap/check.rs:151:45
|
151 | let llvm_version = output(Command::new(&llvm_config).arg("--version"));
| ^^^^^^^^^^^
We've got tests which require a particular version of LLVM to run as they're testing bug fixes. Our build system, however, supports multiple LLVM versions, so we can't run these tests on all LLVM versions. This adds a new `min-llvm-version` directive for tests so they can opt out of being run on older versions of LLVM. This then namely applies that logic to the `issue-36023.rs` test case and... Closes rust-lang#36138
alexcrichton
force-pushed
the
fix-travis
branch
from
82b57ed to
96283fc
Compare
|
@bors: r=brson |
|
📌 Commit 96283fc has been approved by |
|
@bors rollup |
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Sep 2, 2016
test: Add a min-llvm-version directive We've got tests which require a particular version of LLVM to run as they're testing bug fixes. Our build system, however, supports multiple LLVM versions, so we can't run these tests on all LLVM versions. This adds a new `min-llvm-version` directive for tests so they can opt out of being run on older versions of LLVM. This then namely applies that logic to the `issue-36023.rs` test case and... Closes rust-lang#36138
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Sep 2, 2016
test: Add a min-llvm-version directive We've got tests which require a particular version of LLVM to run as they're testing bug fixes. Our build system, however, supports multiple LLVM versions, so we can't run these tests on all LLVM versions. This adds a new `min-llvm-version` directive for tests so they can opt out of being run on older versions of LLVM. This then namely applies that logic to the `issue-36023.rs` test case and... Closes rust-lang#36138
sophiajt
pushed a commit
to sophiajt/rust
that referenced
this pull request
Sep 2, 2016
test: Add a min-llvm-version directive We've got tests which require a particular version of LLVM to run as they're testing bug fixes. Our build system, however, supports multiple LLVM versions, so we can't run these tests on all LLVM versions. This adds a new `min-llvm-version` directive for tests so they can opt out of being run on older versions of LLVM. This then namely applies that logic to the `issue-36023.rs` test case and... Closes rust-lang#36138
|
LLVM 3.9.0 release did not include r279980, so the test actually fails with LLVM 3.9.0, although it succeeds with Rust's LLVM fork. |
|
@sanxiyn I'm sorry I didn't get them to backport the patches 😞. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We've got tests which require a particular version of LLVM to run as they're
testing bug fixes. Our build system, however, supports multiple LLVM versions,
so we can't run these tests on all LLVM versions.
This adds a new
min-llvm-versiondirective for tests so they can opt out ofbeing run on older versions of LLVM. This then namely applies that logic to the
issue-36023.rstest case and...Closes #36138