diff options
author | nulltoken <emeric.fermas@gmail.com> | 2015-02-20 12:08:28 +0100 |
---|---|---|
committer | nulltoken <emeric.fermas@gmail.com> | 2015-02-20 12:08:28 +0100 |
commit | dd1e7bba38e7a679f4a781d9735024fc98e16712 (patch) | |
tree | a2330d5523c20d79b872d3bd34fdbd29e75ea1b2 | |
parent | 5091aff7823dd7badd821afc89b1c4c6761b13cf (diff) | |
download | libgit2-dd1e7bba38e7a679f4a781d9735024fc98e16712.tar.gz |
try to repro libgit2/libgit2sharp#965
-rw-r--r-- | .travis.yml | 22 | ||||
-rwxr-xr-x | script/cibuild.sh | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 68b29b1e2..f9c4057bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,23 +25,6 @@ matrix: exclude: - os: osx compiler: gcc - include: - - compiler: i586-mingw32msvc-gcc - env: OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON -DUSE_SSH=OFF" - os: linux - - compiler: gcc - env: COVERITY=1 - os: linux - - compiler: gcc - env: - - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" - os: linux - allow_failures: - - env: COVERITY=1 - - env: - - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" install: - ./script/install-deps-${TRAVIS_OS_NAME}.sh @@ -50,11 +33,6 @@ install: script: - script/cibuild.sh -# Run Tests -after_success: - - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then sudo apt-get -qq install valgrind; fi - - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi - # Only watch the development and master branches branches: only: diff --git a/script/cibuild.sh b/script/cibuild.sh index 8983dcce0..03370e850 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -16,7 +16,7 @@ mkdir _build cd _build # shellcheck disable=SC2086 cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS || exit $? -make -j2 install || exit $? +cmake --build . --target install || exit $? ctest -V . || exit $? # Now that we've tested the raw git protocol, let's set up ssh to we |