Skip to content

Commit

Permalink
Rollup merge of rust-lang#57233 - Smibu:rename-and-fix-nolink-test, r…
Browse files Browse the repository at this point in the history
…=alexcrichton

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 rust-lang#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](rust-lang#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](rust-lang#21090).

So:

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

r? @alexcrichton
  • Loading branch information
kennytm authored Jan 5, 2019
2 parents 6c58b84 + 794b81e commit 3d8e5d4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
12 changes: 12 additions & 0 deletions src/test/compile-fail/invalid-link-args.rs
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 13 deletions src/test/compile-fail/nolink-with-link-args.rs

This file was deleted.

0 comments on commit 3d8e5d4

Please sign in to comment.