Skip to content

Commit

Permalink
Auto merge of #68664 - tspiteri:no_run-complete-build, r=nikomatsakis
Browse files Browse the repository at this point in the history
rustdoc: attempt full build for compile_fail test

Some code fails when doing a full build but does not fail when only emitting metadata. This commit makes sure compile_fail tests for such code behave as expected, that is, the test succeeds because the compilation fails.

Fixes #67771.
  • Loading branch information
bors committed Feb 6, 2020
2 parents 333c32a + 6d768dd commit 1f8df25
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/librustc_error_codes/error_codes/E0454.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
A link name was given with an empty name. Erroneous code example:

```ignore (cannot-test-this-because-rustdoc-stops-compile-fail-before-codegen)
```compile_fail,E0454
#[link(name = "")] extern {}
// error: `#[link(name = "")]` given with empty name
```
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_error_codes/error_codes/E0458.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
An unknown "kind" was specified for a link attribute. Erroneous code example:

```ignore (cannot-test-this-because-rustdoc-stops-compile-fail-before-codegen)
```compile_fail,E0458
#[link(kind = "wonderful_unicorn")] extern {}
// error: unknown kind: `wonderful_unicorn`
```
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_error_codes/error_codes/E0459.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
A link was used without a name parameter. Erroneous code example:

```ignore (cannot-test-this-because-rustdoc-stops-compile-fail-before-codegen)
```compile_fail,E0459
#[link(kind = "dylib")] extern {}
// error: `#[link(...)]` specified without `name = "foo"`
```
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ fn run_test(
for debugging_option_str in &options.debugging_options_strs {
compiler.arg("-Z").arg(&debugging_option_str);
}
if no_run {
if no_run && !compile_fail {
compiler.arg("--emit=metadata");
}
compiler.arg("--target").arg(target.to_string());
Expand Down

0 comments on commit 1f8df25

Please sign in to comment.