Skip to content

Commit

Permalink
Rollup merge of rust-lang#59806 - phansch:compiletest_docs2, r=oli-obk
Browse files Browse the repository at this point in the history
compiletest: Improve no_prefer_dynamic docs

This adds some extra docs for the `no-prefer-dynamic` header.

And also a `s/must_compile_successfully/compile_pass`.

`must_compile_successfully` has been renamed to `compile_pass` at some
point in the past and this comment was still referring to the old name.
  • Loading branch information
Centril authored Apr 12, 2019
2 parents d77b7d9 + edebed9 commit 2f71ecb
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/tools/compiletest/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,10 @@ pub struct TestProps {
// For UI tests, allows compiler to generate arbitrary output to stderr
pub dont_check_compiler_stderr: bool,
// Don't force a --crate-type=dylib flag on the command line
//
// Set this for example if you have an auxiliary test file that contains
// a proc-macro and needs `#![crate_type = "proc-macro"]`. This ensures
// that the aux file is compiled as a `proc-macro` and not as a `dylib`.
pub no_prefer_dynamic: bool,
// Run --pretty expanded when running pretty printing tests
pub pretty_expanded: bool,
Expand Down Expand Up @@ -490,7 +494,7 @@ impl TestProps {
}

if !self.compile_pass {
// run-pass implies must_compile_successfully
// run-pass implies compile_pass
self.compile_pass = config.parse_compile_pass(ln) || self.run_pass;
}

Expand Down

0 comments on commit 2f71ecb

Please sign in to comment.