Skip to content

Commit

Permalink
Test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Mar 23, 2018
1 parent 3ebe12e commit 0e6cd8b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/test/run-pass/rfc-2151-raw-identifiers/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-pretty

#![feature(raw_identifiers)]

use std::mem;
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/rfc-2151-raw-identifiers/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-pretty

#![feature(raw_identifiers)]

fn r#fn(r#match: u32) -> u32 {
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/rfc-2151-raw-identifiers/items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-pretty

#![feature(raw_identifiers)]

#[derive(Debug, PartialEq, Eq)]
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/rfc-2151-raw-identifiers/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-pretty

#![feature(decl_macro)]
#![feature(raw_identifiers)]

Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2426,7 +2426,7 @@ impl<'test> TestCx<'test> {
// compiler flags set in the test cases:
cmd.env_remove("RUSTFLAGS");

if self.config.target.contains("msvc") {
if self.config.target.contains("msvc") && self.config.cc != "" {
// We need to pass a path to `lib.exe`, so assume that `cc` is `cl.exe`
// and that `lib.exe` lives next to it.
let lib = Path::new(&self.config.cc).parent().unwrap().join("lib.exe");
Expand Down

0 comments on commit 0e6cd8b

Please sign in to comment.