summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNobuaki Sukegawa <nsukeg@gmail.com>2015-03-29 14:48:48 +0900
committerRoger Meier <roger@apache.org>2015-03-29 14:39:32 +0200
commitf5b795d3be6acc0da30afc4b4aa77e531125eec6 (patch)
treeac808f8ea26ea5481f0811f4daa4b273f0b0bde5 /.travis.yml
parent58ed1cdf3cd4da9d013e4cd4b92b3f4e440d145d (diff)
downloadthrift-f5b795d3be6acc0da30afc4b4aa77e531125eec6.tar.gz
THRIFT-2578 Moving 'make cross' from test.sh to test.py
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index bb45961a0..e5b8e02df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,15 +56,10 @@ env:
matrix:
# Put it here because it's most time consuming
- 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"
+ MAKE_TARGET="cross"
# CMake builds
- TEST_NAME="compiler (CMake + CPack)"