From 09be5cad5b410a98d3008817e35a9be99e3926e4 Mon Sep 17 00:00:00 2001 From: krad Date: Wed, 13 Apr 2016 15:56:46 -0700 Subject: [PATCH] Minor fix to sandcastle java job definition Summary: System was not able to locate javac Test Plan: Run command manually and observe output Subscribers: andrewkr, dhruba, leveldb Differential Revision: https://reviews.facebook.net/D56709 --- build_tools/rocksdb-lego-determinator | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator index 94dc07e1b..d861a4b6e 100755 --- a/build_tools/rocksdb-lego-determinator +++ b/build_tools/rocksdb-lego-determinator @@ -69,7 +69,7 @@ LITE="OPT=-DROCKSDB_LITE" TSAN="COMPILE_WITH_TSAN=1" UBSAN="COMPILE_WITH_UBSAN=1" DISABLE_JEMALLOC="DISABLE_JEMALLOC=1" -JDK="JAVA_HOME=/usr/local/jdk-7u10-64/" +SETUP_JDK="export JAVA_HOME=/usr/local/jdk-7u10-64/; export PATH=\$PATH:\$JAVA_HOME/bin" PARSER="'parser':'egrep \'Failure|^#|Abort|Expected|Actual|GoogleTestFailure|^==\''" ARTIFACTS=" 'artifacts': [ @@ -647,7 +647,7 @@ JAVA_BUILD_TEST_COMMANDS="[ $CLEANUP_ENV, { 'name':'Build RocksDB for Java', - 'shell':'$JDK $SHM `fwdproxy-config --format=sh curl` make rocksdbjava', + 'shell':'$SETUP_JDK; $SHM `fwdproxy-config --format=sh curl` make rocksdbjava', 'user':'root', $PARSER },