Skip to content

Commit 3ff3684

Browse files
committed
AppVeyor: use MSVC + Rust 1.8; Travis: run all tests
1 parent d31ae9a commit 3ff3684

File tree

2 files changed

+52
-33
lines changed

2 files changed

+52
-33
lines changed

.travis.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,29 @@ rust:
55
- beta
66
- nightly
77
script:
8-
- cd $TRAVIS_BUILD_DIR/remutex && cargo build --verbose && cargo test --verbose
8+
- |
9+
cd $TRAVIS_BUILD_DIR/remutex &&
10+
cargo build -v &&
11+
cargo test -v --no-run &&
12+
cargo test -v
13+
- |
14+
cd $TRAVIS_BUILD_DIR/libhdf5-lib &&
15+
cargo build -v &&
16+
cargo test -v --no-run &&
17+
cargo test -v
18+
- |
19+
cd $TRAVIS_BUILD_DIR/libhdf5-sys &&
20+
cargo build -v &&
21+
cargo test -v --no-run &&
22+
cargo test -v
923
- |
1024
cd $TRAVIS_BUILD_DIR &&
11-
cargo build --verbose &&
1225
case $TRAVIS_RUST_VERSION in
13-
nightly) cargo test --verbose --features lint ;;
14-
*) cargo test --verbose ;;
26+
nightly) cargo build -v --features lint ;;
27+
*) cargo build -v ;;
1528
esac &&
29+
cargo test -v --no-run &&
30+
cargo test -v &&
1631
cargo doc --no-deps
1732
addons:
1833
apt:

appveyor.yml

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
1-
version: 0.1.{build}
1+
version: 0.1.{build}-{branch}
2+
platform:
3+
- x64
4+
os: Visual Studio 2015
5+
matrix:
6+
fast_finish: true
7+
skip_tags: true
8+
build: false
9+
10+
init:
11+
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
212

313
environment:
4-
RUST_TARGET: x86_64-pc-windows-gnu
5-
# RUST_TARGET: x86_64-pc-windows-msvc
6-
HDF5_LIBDIR: C:\HDF5\lib
14+
TARGET: x86_64-pc-windows-msvc
15+
HDF5_ROOT: "C:\\Program Files\\HDF_Group\\HDF5\\1.8.16"
716
matrix:
8-
- RUST_VERSION: 1.8.0
9-
- RUST_VERSION: beta
10-
- RUST_VERSION: nightly
11-
VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\vcvars64.bat"
17+
- CHANNEL: 1.8.0
18+
- CHANNEL: beta
19+
- CHANNEL: nightly
1220
install:
13-
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:RUST_TARGET}.msi"
14-
- ps: Start-Process -FilePath msiexec -ArgumentList /i, rust-${env:RUST_VERSION}-${env:RUST_TARGET}.msi, INSTALLDIR="C:\Rust", /quiet -Wait
21+
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:CHANNEL}-${env:TARGET}.msi"
22+
- ps: Start-Process -FilePath msiexec -ArgumentList /i, rust-${env:CHANNEL}-${env:TARGET}.msi, INSTALLDIR="C:\Rust", /quiet -Wait
1523
- set PATH=%PATH%;C:\Rust\bin
16-
- cmd: mkdir C:\HDF5
17-
- cmd: mkdir C:\HDF5\lib
18-
- ps: Invoke-WebRequest "https://github.com/kkirstein/hdf5-rs/releases/download/alpha/hdf5.dll" -OutFile "C:\HDF5\lib\hdf5.dll"
19-
# - ps: Invoke-WebRequest http://repo.continuum.io/pkgs/free/win-64/hdf5-1.8.15.1-vc14_4.tar.bz2 -OutFile hdf5.tar.bz2
20-
# - cmd: 7z x -y hdf5.tar.bz2
21-
# - cmd: 7z x -y hdf5.tar
22-
# - cmd: xcopy Library C:\HDF5 /s /e /y
23-
24-
# - ps: Invoke-WebRequest "http://www.hdfgroup.org/ftp/HDF5/current/bin/windows/extra/hdf5-1.8.16-win64-vs2015-shared.zip" -OutFile hdf5.zip
25-
# - cmd: 7z x hdf5.zip -y
26-
# - ps: Start-Process -FilePath msiexec -ArgumentList /i, "hdf5\HDF5-1.8.16-win64.msi", INSTALLDIR="C:\HDF5" -Wait
27-
- cmd: CALL "%VCVARS%"
28-
# - cmd: set PATH=C:\HDF5;%PATH%
29-
- cmd: set PATH=C:\HDF5\bin;%PATH%
30-
# output version info
31-
- rustc --version
32-
- cargo --version
33-
34-
build: false
24+
- rustc -vV
25+
- cargo -vV
26+
- ps: Invoke-WebRequest "http://www.hdfgroup.org/ftp/HDF5/current/bin/windows/extra/hdf5-1.8.16-win64-vs2015-shared.zip" -OutFile hdf5.zip
27+
- 7z x hdf5.zip -y
28+
- ps: Start-Process -FilePath msiexec -ArgumentList /i, "hdf5\HDF5-1.8.16-win64.msi", /quiet -Wait
29+
- set PATH=%PATH%;%HDF5_ROOT%\bin
30+
- set HDF5_LIBDIR=%HDF5_ROOT%\lib
3531

3632
test_script:
33+
- cd %APPVEYOR_BUILD_FOLDER%\libhdf5-lib
34+
- cargo test -v --no-run
35+
- cargo test -v
36+
- cd %APPVEYOR_BUILD_FOLDER%\libhdf5-sys
37+
- cargo test -v --no-run
38+
- cargo test -v
39+
- cd %APPVEYOR_BUILD_FOLDER%
40+
- cargo test -v --no-run
3741
- cargo test --verbose

0 commit comments

Comments
 (0)