Skip to content

Commit ecca55c

Browse files
committed
Merge pull request #927 from oli-obk/german_windows_32bit
German windows 32bit
2 parents e890bb5 + d4e11ac commit ecca55c

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

tests/compile-fail/conf_non_existant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern: error reading Clippy's configuration file: No such file or directory
1+
// error-pattern: error reading Clippy's configuration file
22

33
#![feature(plugin)]
44
#![plugin(clippy(conf_file="./tests/compile-fail/non_existant_conf.toml"))]

tests/compile-fail/enums_clike.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore-x86
12
#![feature(plugin, associated_consts)]
23
#![plugin(clippy)]
34
#![deny(clippy)]

tests/compile-test.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate compiletest_rs as compiletest;
22

33
use std::path::PathBuf;
4-
use std::env::var;
4+
use std::env::{var, temp_dir};
55

66
fn run_mode(dir: &'static str, mode: &'static str) {
77
let mut config = compiletest::default_config();
@@ -14,6 +14,10 @@ fn run_mode(dir: &'static str, mode: &'static str) {
1414
}
1515

1616
config.mode = cfg_mode;
17+
if cfg!(windows) {
18+
// work around https://github.com/laumann/compiletest-rs/issues/35 on msvc windows
19+
config.build_base = temp_dir();
20+
}
1721
config.src_base = PathBuf::from(format!("tests/{}", dir));
1822

1923
compiletest::run_tests(&config);

tests/dogfood.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
extern crate compiletest_rs as compiletest;
66
extern crate test;
77

8-
use std::env::{var, set_var};
8+
use std::env::{var, set_var, temp_dir};
99
use std::path::PathBuf;
1010
use test::TestPaths;
1111

@@ -23,6 +23,11 @@ fn dogfood() {
2323
config.filter = Some(name.to_owned())
2424
}
2525

26+
if cfg!(windows) {
27+
// work around https://github.com/laumann/compiletest-rs/issues/35 on msvc windows
28+
config.build_base = temp_dir();
29+
}
30+
2631
config.mode = cfg_mode;
2732

2833
let paths = TestPaths {

0 commit comments

Comments
 (0)