diff options
| author | costan <costan@google.com> | 2017-07-27 16:34:19 -0700 |
|---|---|---|
| committer | Victor Costan <pwnall@chromium.org> | 2017-07-27 16:46:54 -0700 |
| commit | e4de6ce087aaf72dfce7d8d252c3a82f18419cae (patch) | |
| tree | ae0774bb009ad8b94ef2e2c0d09ac971dc9c2efb | |
| parent | c756f7f5d90ad7591d4f96bb0da8159634943359 (diff) | |
| download | snappy-e4de6ce087aaf72dfce7d8d252c3a82f18419cae.tar.gz snappy-e4de6ce087aaf72dfce7d8d252c3a82f18419cae.tar.bz2 snappy-e4de6ce087aaf72dfce7d8d252c3a82f18419cae.zip | |
Small improvements to open source CI configuration.
This CL fixes 64-bit Windows testing (), makes it possible to view the
test output in the Travis / AppVeyor CI console while the test is
running, and takes advantage of the new support for the .appveyor.yml
file name to make the CI configuration less obtrusive.
| -rw-r--r-- | .appveyor.yml (renamed from appveyor.yml) | 7 | ||||
| -rw-r--r-- | .travis.yml | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/appveyor.yml b/.appveyor.yml index 886150f..f54dbfb 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -30,9 +30,12 @@ build_script: - git submodule update --init --recursive - mkdir out - cd out + - if "%platform%"=="x64" set CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64 - cmake .. -G "%CMAKE_GENERATOR%" - -DCMAKE_CONFIGURATION_TYPES="Debug;RelWithDebInfo" + -DCMAKE_CONFIGURATION_TYPES="%CONFIGURATION%" - cmake --build . --config %CONFIGURATION% + - cd .. + - cmake --version test_script: - - ctest -C %CONFIGURATION% --output-on-failure + - out\%CONFIGURATION%\snappy-unittest
\ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 88c28fd..65ee97e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ matrix: addons: apt: - # List of whitelisted in travis packages for ubuntu-precise can be found here: - # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise + # List of whitelisted in travis packages for ubuntu-trusty can be found here: + # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-trusty # List of whitelisted in travis apt-sources: # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json sources: @@ -48,6 +48,12 @@ install: - echo ${CXX} - ${CXX} --version +before_script: +- mkdir -p build && cd build +- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE +- cmake --build . +- cd .. +- cmake --version + script: -- mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE && - CTEST_OUTPUT_ON_FAILURE=1 make all test
\ No newline at end of file +- build/snappy-unittest
\ No newline at end of file |