OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #57233 - Smibu:rename-and-fix-nolink-test, r=alexcrichton

Browse Source 
Rename and fix nolink-with-link-args test

There are three problems with the nolink-with-link-args test:

* The test fails when using MSVC. It's caused by the `linker-flavor=ld` flag which was added in #46291.
* In its comment, this test tests that "link_args are indeed passed when nolink is specified", but the `nolink` attribute has been removed [a long time ago](https://github.com/rust-lang/rust/pull/12826).
* Pattern has a small typo.

At first I was going to completely remove this test, but there is [a closed pull request for that](https://github.com/rust-lang/rust/pull/21090).

So:

* rename the file as suggested in the closed PR
* adjust the comment
* fix typo in the pattern
* add `ignore-msvc`.

r? @alexcrichton
This commit is contained in:
kennytm 2019-01-05 23:56:46 +08:00 committed by GitHub
commit 3d8e5d40c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/compile-fail/invalid-link-args.rs Normal file
View File

@ -0,0 +1,12 @@
// ignore-msvc due to linker-flavor=ld
// error-pattern:aFdEfSeVEEE
// compile-flags: -C linker-flavor=ld
/* Make sure invalid link_args are printed to stderr. */
#![feature(link_args)]
#[link_args = "aFdEfSeVEEE"]
extern {}
fn main() { }

13
src/test/compile-fail/nolink-with-link-args.rs
View File

@ -1,13 +0,0 @@
// error-pattern:aFdEfSeVEE
// compile-flags: -C linker-flavor=ld
/* We're testing that link_args are indeed passed when nolink is specified.
So we try to compile with junk link_args and make sure they are visible in
the compiler output. */
#![feature(link_args)]
#[link_args = "aFdEfSeVEEE"]
extern {}
fn main() { }