From f1d0b1b870358a28a8fc1366c82a3c3009d06bae Mon Sep 17 00:00:00 2001 From: Tobias Peters Date: Sun, 17 Jan 2016 13:36:40 +0100 Subject: [PATCH] Merged github:zerotacg/ryzomcore/feature/enable-unit-tests-for-travis-ci --HG-- branch : feature/enable-unit-tests-for-travis-ci --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac0c28a1b..2028a4c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,12 @@ compiler: os: - linux env: - - CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=on -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=off" - - CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=on -DWITH_LUA53:BOOL=off" - - CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=on" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=on -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=off" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=on -DWITH_LUA53:BOOL=off" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=on" + - CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so" + CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2" + RUN="build/bin/nel_unit_test" addons: apt: @@ -30,10 +33,12 @@ addons: before_script: - mkdir build - cmake --version + - cmake -Hcode -Bbuild $CMAKE_CONFIGURE_OPTIONS + - cat build/CMakeCache.txt script: - - cmake -Hcode -Bbuild $CMAKE_BUILD_OPTIONS - - cmake --build build -- -j 2 + - cmake --build build $CMAKE_BUILD_OPTIONS + - $RUN notifications: irc: