Merge pull request #927 from oli-obk/german_windows_32bit

German windows 32bit
This commit is contained in:
llogiq 2016-05-13 15:41:49 +02:00
commit ecca55cd9f
4 changed files with 13 additions and 3 deletions

View File

@ -1,4 +1,4 @@
// error-pattern: error reading Clippy's configuration file: No such file or directory // error-pattern: error reading Clippy's configuration file
#![feature(plugin)] #![feature(plugin)]
#![plugin(clippy(conf_file="./tests/compile-fail/non_existant_conf.toml"))] #![plugin(clippy(conf_file="./tests/compile-fail/non_existant_conf.toml"))]

View File

@ -1,3 +1,4 @@
// ignore-x86
#![feature(plugin, associated_consts)] #![feature(plugin, associated_consts)]
#![plugin(clippy)] #![plugin(clippy)]
#![deny(clippy)] #![deny(clippy)]

View File

@ -1,7 +1,7 @@
extern crate compiletest_rs as compiletest; extern crate compiletest_rs as compiletest;
use std::path::PathBuf; use std::path::PathBuf;
use std::env::var; use std::env::{var, temp_dir};
fn run_mode(dir: &'static str, mode: &'static str) { fn run_mode(dir: &'static str, mode: &'static str) {
let mut config = compiletest::default_config(); let mut config = compiletest::default_config();
@ -14,6 +14,10 @@ fn run_mode(dir: &'static str, mode: &'static str) {
} }
config.mode = cfg_mode; config.mode = cfg_mode;
if cfg!(windows) {
// work around https://github.com/laumann/compiletest-rs/issues/35 on msvc windows
config.build_base = temp_dir();
}
config.src_base = PathBuf::from(format!("tests/{}", dir)); config.src_base = PathBuf::from(format!("tests/{}", dir));
compiletest::run_tests(&config); compiletest::run_tests(&config);

View File

@ -5,7 +5,7 @@
extern crate compiletest_rs as compiletest; extern crate compiletest_rs as compiletest;
extern crate test; extern crate test;
use std::env::{var, set_var}; use std::env::{var, set_var, temp_dir};
use std::path::PathBuf; use std::path::PathBuf;
use test::TestPaths; use test::TestPaths;
@ -23,6 +23,11 @@ fn dogfood() {
config.filter = Some(name.to_owned()) config.filter = Some(name.to_owned())
} }
if cfg!(windows) {
// work around https://github.com/laumann/compiletest-rs/issues/35 on msvc windows
config.build_base = temp_dir();
}
config.mode = cfg_mode; config.mode = cfg_mode;
let paths = TestPaths { let paths = TestPaths {