octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patched openjdk java path on travis at 12/4/2016

Browse Source
This commit is contained in:
Takeshi Nakatani 2016-12-04 07:45:28 +00:00
parent 5350e03147
commit b428f68acf
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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

11
test/integration-test-common.sh
View File

@ -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);