From 4d7c04e0356274c76290b07e083293c4507a03a8 Mon Sep 17 00:00:00 2001 From: Peter Atashian Date: Wed, 9 Sep 2015 23:17:22 -0400 Subject: [PATCH 1/2] test(windows): Improve appveyor ci Signed-off-by: Peter Atashian --- .appveyor.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ab4180c6..3d249e9f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,23 +1,15 @@ environment: - CARGO_TARGET: x86_64-pc-windows-gnu - matrix: - - TARGET: x86_64-pc-windows-msvc - - TARGET: i686-pc-windows-gnu + matrix: + - TARGET: x86_64-pc-windows-msvc + - TARGET: i686-pc-windows-msvc + - TARGET: x86_64-pc-windows-gnu + - TARGET: i686-pc-windows-gnu install: - - ps: Start-FileDownload "https://static.rust-lang.org/dist/rustc-nightly-${env:TARGET}.tar.gz" - - ps: Start-FileDownload "https://static.rust-lang.org/cargo-dist/cargo-nightly-${env:CARGO_TARGET}.tar.gz" - - 7z x rustc-nightly-%TARGET%.tar.gz > nul - - 7z x rustc-nightly-%TARGET%.tar > nul - - 7z x cargo-nightly-%CARGO_TARGET%.tar.gz > nul - - 7z x cargo-nightly-%CARGO_TARGET%.tar > nul - - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 - - set PATH=%PATH%;%cd%/rustc-nightly-%TARGET%/rustc/bin - - set PATH=%PATH%;%cd%/cargo-nightly-%CARGO_TARGET%/cargo/bin - - SET PATH=%PATH%;C:\MinGW\bin - - rustc -V - - cargo -V - + - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" -FileName "rust-nightly.exe" + - ps: .\rust-nightly.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null + - ps: $env:PATH="$env:PATH;C:\rust\bin" + - rustc -vV + - cargo -vV build: false - test_script: - - cargo test --verbose --no-default-features + - cargo test --verbose --no-default-features From e0b9a11c9c8881c9914378d297f89177ec142541 Mon Sep 17 00:00:00 2001 From: Peter Atashian Date: Thu, 10 Sep 2015 00:09:14 -0400 Subject: [PATCH 2/2] test(windows): Ignore #[should_panic] tests on 32-bit msvc Signed-off-by: Peter Atashian --- src/header/shared/quality_item.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/header/shared/quality_item.rs b/src/header/shared/quality_item.rs index bb2d1da8..ba321b21 100644 --- a/src/header/shared/quality_item.rs +++ b/src/header/shared/quality_item.rs @@ -200,13 +200,15 @@ mod tests { } #[test] - #[should_panic] + #[should_panic] // FIXME - 32-bit msvc unwinding broken + #[cfg_attr(all(target_arch="x86", target_env="msvc"), ignore)] fn test_quality_invalid() { q(-1.0); } #[test] - #[should_panic] + #[should_panic] // FIXME - 32-bit msvc unwinding broken + #[cfg_attr(all(target_arch="x86", target_env="msvc"), ignore)] fn test_quality_invalid2() { q(2.0); }