diff --git a/.travis.yml b/.travis.yml index bd41673..1beea25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,7 @@ dist: trusty cache: apt before_install: - sudo apt-get update -qq - - sudo apt-get install -qq cppcheck libfuse-dev - - sudo apt-get install openjdk-7-jdk - - sudo update-alternatives --config java + - sudo apt-get install -qq cppcheck libfuse-dev openjdk-7-jdk script: - ./autogen.sh - ./configure diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 5368cf3..a1c872c 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -99,6 +99,15 @@ function start_s3proxy { else S3PROXY_CONFIG="s3proxy.conf" fi + JAVA_BIN=`which java` + if [ $? -ne 0 ]; then + if [ -f /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java ]; then + JAVA_BIN=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java + else + # not found java command, so probabry gets error by stdbuf command line. + JAVA_BIN=java + fi + fi if [ -n "${S3PROXY_BINARY}" ] then @@ -108,7 +117,7 @@ function start_s3proxy { chmod +x "${S3PROXY_BINARY}" fi - stdbuf -oL -eL java -jar "$S3PROXY_BINARY" --properties $S3PROXY_CONFIG | stdbuf -oL -eL sed -u "s/^/s3proxy: /" & + stdbuf -oL -eL ${JAVA_BIN} -jar "$S3PROXY_BINARY" --properties $S3PROXY_CONFIG | stdbuf -oL -eL sed -u "s/^/s3proxy: /" & # wait for S3Proxy to start for i in $(seq 30);