commit f5b795d3be6acc0da30afc4b4aa77e531125eec6
author Nobuaki Sukegawa <nsukeg@gmail.com> Sun Mar 29 14:48:48 2015 +0900
committer Roger Meier <roger@apache.org> Sun Mar 29 14:39:32 2015 +0200
tree ac808f8ea26ea5481f0811f4daa4b273f0b0bde5
parent 58ed1cdf3cd4da9d013e4cd4b92b3f4e440d145d

THRIFT-2578 Moving 'make cross' from test.sh to test.py

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index bb45961..e5b8e02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,15 +56,10 @@
   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)"