Merge pull request #3 from terrytangyuan/terry

Add integration test for linux
yzhliu · Dec 17, 2015 · 2d87baf · 2d87baf
2 parents 686fcc7 + 5b7790e
commit 2d87baf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,8 +30,6 @@ matrix:
       env: TASK=doc
     - os: linux
       env: TASK=r_test
-    - os: linux
-      env: TASK=scala_test
 
 # dependent apt packages
 addons:

diff --git a/tests/travis/run_test.sh b/tests/travis/run_test.sh
@@ -119,12 +119,17 @@ if [ ${TASK} == "scala_test" ]; then
     mkdir -p ${CACHE_PREFIX}/data
     ln -s ${CACHE_PREFIX}/data ${PWD}/data
 
+    cd scala-package
+    export JAVA_HOME=$(/usr/libexec/java_home)
+
     if [ ${TRAVIS_OS_NAME} == "osx" ]; then
-        cd scala-package
-        export JAVA_HOME=$(/usr/libexec/java_home)
         mvn clean package -P osx-x86_64
         mvn integration-test -P osx-x86_64
     fi
+    if [ ${TRAVIS_OS_NAME} == "linux" ]; then
+        mvn clean package -P linux-x86_64
+        mvn integration-test -P linux-x86_64
+    fi
 
     exit 0
 fi