Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ environment:
global:
PROJECT_NAME: rust-clippy
matrix:
- 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: 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-msvc
MSYS2_BITS: 64

Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions tests/dogfood.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down