summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRoger Meier <roger@apache.org>2015-03-24 22:30:40 +0100
committerRoger Meier <roger@apache.org>2015-03-24 22:30:40 +0100
commit41ad4342c5a0389ab2cf2dbf098086413ac01204 (patch)
tree1ce9c7d4e70a7370f132ce5d4fd245a20a68e45e /.travis.yml
parenta2d12b6ee3d9aa66f2c16dc6a5ee6eef5f1eba92 (diff)
downloadthrift-41ad4342c5a0389ab2cf2dbf098086413ac01204.tar.gz
THRIFT-847 Test Framework harmonization across all languages
THRIFT-2946 Enhance usability of cross test framework Patch: Nobuaki Sukegawa This closes: #358
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index a5c728e23..bb45961a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,11 +55,17 @@ env:
matrix:
# Put it here because it's most time consuming
- - TEST_NAME="make cross (gcc, automake)"
+ - TEST_NAME="make cross (automake)"
CONFIG="--without-python"
ALL_DEPS="yes"
MAKE_TARGET="cross"
+ - TEST_NAME="make cross-py (automake)"
+ THRIFT_CROSSTEST_CONCURRENCY=6
+ CONFIG="--enable-tutorial=no --without-erlang --without-lua --without-haxe --without-d"
+ ALL_DEPS="yes"
+ MAKE_TARGET="cross2"
+
# CMake builds
- TEST_NAME="compiler (CMake + CPack)"
CMAKE_CONFIG="-DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF"
@@ -86,7 +92,7 @@ env:
- TEST_NAME="Small Set (automake)"
CONFIG="--without-erlang --without-haskell --without-python --without-go --without-lua --without-d --without-ruby --without-nodejs --without-java"
ALL_DEPS="yes"
- - TEST_NAME="dist (gcc, automake)"
+ - TEST_NAME="dist (automake)"
CONFIG=""
ALL_DEPS="yes"
MAKE_TARGET="dist"
@@ -99,13 +105,13 @@ matrix:
exclude:
# This one takes very long
- compiler: gcc
- env: TEST_NAME="make cross (gcc, automake)" CONFIG="--without-python" ALL_DEPS="yes" MAKE_TARGET="cross"
+ env: TEST_NAME="make cross (automake)" CONFIG="--without-python" ALL_DEPS="yes" MAKE_TARGET="cross"
# Does not use native compiler, no need to do it twice
- compiler: gcc
env: TEST_NAME="compiler (mingw32-gcc, CMake + CPack)" CMAKE_CONFIG="-DCMAKE_TOOLCHAIN_FILE=../contrib/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF"
- compiler: gcc
- env: TEST_NAME="dist (gcc, automake)" CONFIG="" ALL_DEPS="yes" MAKE_TARGET="dist"
+ env: TEST_NAME="dist (automake)" CONFIG="" ALL_DEPS="yes" MAKE_TARGET="dist"
include:
- env: