Merge pull request #1543 from Manishearth/fix-windows-tests

fix windows tests

Author: oli-obk

appveyor.yml

@@ -4,8 +4,10 @@ environment:
     matrix:
         - TARGET: i686-pc-windows-gnu
           MSYS2_BITS: 32
+          RUN_CARGO_CLIPPY: true
         - TARGET: i686-pc-windows-msvc
           MSYS2_BITS: 32
+          RUN_CARGO_CLIPPY: true
         - TARGET: x86_64-pc-windows-gnu
           MSYS2_BITS: 64
         - TARGET: x86_64-pc-windows-msvc
@@ -22,11 +24,12 @@ install:
 build: false
 
 test_script:
+    - set RUST_BACKTRACE=1
     - cargo build --features debugging
     - cargo test --features debugging
     - copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
     - cargo clippy -- -D clippy
-    - cd clippy_lints && cargo clippy -- -D clippy && cd ..
+    - if defined RUN_CARGO_CLIPPY cd clippy_lints && cargo clippy -- -D clippy && cd ..
 
 notifications:
     - provider: Email

tests/compile-test.rs

@@ -29,4 +29,8 @@ fn compile_test() {
     prepare_env();
     run_mode("run-pass", "run-pass");
     run_mode("ui", "ui");
+    #[cfg(target_os = "windows")]
+    run_mode("ui-windows", "ui");
+    #[cfg(not(target_os = "windows"))]
+    run_mode("ui-posix", "ui");
 }

tests/ui/conf_bad_toml.rs renamed to tests/ui-posix/conf_bad_toml.rs

@@ -0,0 +1,6 @@
+// error-pattern: error reading Clippy's configuration file
+
+#![feature(plugin)]
+#![plugin(clippy(conf_file="./tests/compile-fail/conf_bad_toml.toml"))]
+
+fn main() {}

tests/ui/conf_bad_toml.stderr renamed to tests/ui-posix/conf_bad_toml.stderr

@@ -0,0 +1,4 @@
+error: error reading Clippy's configuration file: The system cannot find the file specified. (os error 2)
+
+error: aborting due to previous error
+

tests/ui/conf_bad_toml.toml renamed to tests/ui-posix/conf_bad_toml.toml

@@ -0,0 +1,2 @@
+fn this_is_obviously(not: a, toml: file) {
+}

tests/ui/conf_bad_type.rs renamed to tests/ui-posix/conf_bad_type.rs

@@ -0,0 +1,6 @@
+// error-pattern: error reading Clippy's configuration file: `blacklisted-names` is expected to be a `Vec < String >` but is a `integer`
+
+#![feature(plugin)]
+#![plugin(clippy(conf_file="./tests/compile-fail/conf_bad_type.toml"))]
+
+fn main() {}

tests/ui/conf_bad_type.stderr renamed to tests/ui-posix/conf_bad_type.stderr

@@ -0,0 +1,4 @@
+error: error reading Clippy's configuration file: The system cannot find the file specified. (os error 2)
+
+error: aborting due to previous error
+

tests/ui/conf_bad_type.toml renamed to tests/ui-posix/conf_bad_type.toml

@@ -0,0 +1 @@
+blacklisted-names = 42

tests/ui/conf_non_existant.rs renamed to tests/ui-posix/conf_non_existant.rs

@@ -0,0 +1,6 @@
+// error-pattern: error reading Clippy's configuration file
+
+#![feature(plugin)]
+#![plugin(clippy(conf_file="./tests/auxiliary/non_existant_conf.toml"))]
+
+fn main() {}

tests/ui/conf_non_existant.stderr renamed to tests/ui-posix/conf_non_existant.stderr

@@ -0,0 +1,4 @@
+error: error reading Clippy's configuration file: The system cannot find the file specified. (os error 2)
+
+error: aborting due to previous error
+