From 920fc174853a2a31111349d695841c5dd61f61fb Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Tue, 16 Jan 2018 15:26:32 +0100 Subject: [PATCH 1/5] Don't run dogfood on windows or in the rustc test suite --- tests/dogfood.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/dogfood.rs b/tests/dogfood.rs index 8ca9b5c92a4c..590027f84918 100644 --- a/tests/dogfood.rs +++ b/tests/dogfood.rs @@ -3,6 +3,9 @@ fn dogfood() { if option_env!("RUSTC_TEST_SUITE").is_some() { return; } + if cfg!(windows) { + return; + } let root_dir = std::env::current_dir().unwrap(); for d in &[".", "clippy_lints"] { std::env::set_current_dir(root_dir.join(d)).unwrap(); From b1001e47d6933ce3a5252c0713827b1b9903984b Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Tue, 16 Jan 2018 16:36:58 +0100 Subject: [PATCH 2/5] Disable gnu builds on appveyor, rustc plugins are broken there --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c17b12a33b38..729216d0b904 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,12 +2,12 @@ environment: global: PROJECT_NAME: rust-clippy matrix: - - TARGET: i686-pc-windows-gnu - MSYS2_BITS: 32 + #- TARGET: i686-pc-windows-gnu + # MSYS2_BITS: 32 - TARGET: i686-pc-windows-msvc MSYS2_BITS: 32 - - TARGET: x86_64-pc-windows-gnu - MSYS2_BITS: 64 + #- TARGET: x86_64-pc-windows-gnu + # MSYS2_BITS: 64 - TARGET: x86_64-pc-windows-msvc MSYS2_BITS: 64 From 26f83d621889b2a7474cd0542c63c77a5a15c02e Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Wed, 17 Jan 2018 08:52:41 +0100 Subject: [PATCH 3/5] Readd the .exe extension on windows --- src/main.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 8affe549348d..8fd485b9efac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -180,9 +180,12 @@ where args.push("--cfg".to_owned()); args.push(r#"feature="cargo-clippy""#.to_owned()); - let path = std::env::current_exe() + let mut path = std::env::current_exe() .expect("current executable path invalid") .with_file_name("clippy-driver"); + if cfg!(windows) { + path.set_extension("exe"); + } let exit_status = std::process::Command::new("cargo") .args(&args) .env("RUSTC_WRAPPER", path) From 248bef67f2023f2c9a0af52eea1cc830c87f1b37 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Wed, 17 Jan 2018 08:53:13 +0100 Subject: [PATCH 4/5] Don't run 32 bit checks on windows --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 729216d0b904..a0110a546c21 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,8 @@ environment: matrix: #- TARGET: i686-pc-windows-gnu # MSYS2_BITS: 32 - - TARGET: i686-pc-windows-msvc - MSYS2_BITS: 32 + #- TARGET: i686-pc-windows-msvc + # MSYS2_BITS: 32 #- TARGET: x86_64-pc-windows-gnu # MSYS2_BITS: 64 - TARGET: x86_64-pc-windows-msvc From d9063b70d3abcc2fa16200d7c49bf0db39fbc66c Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 19 Jan 2018 13:12:57 +0100 Subject: [PATCH 5/5] Don't run cargo clippy on appveyor --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a0110a546c21..32ea8c62a2de 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,9 +26,9 @@ 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 .. + #- copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\ + #- cargo clippy -- -D clippy + #- cd clippy_lints && cargo clippy -- -D clippy && cd .. notifications: - provider: Email