[kudu] branch master updated: build-and-test.sh: fix TIDY build

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new c4e2561  build-and-test.sh: fix TIDY build
c4e2561 is described below

commit c4e256198da842a4600afd5111d78e7480d6cdd6
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Mon Mar 16 01:33:47 2020 -0700

    build-and-test.sh: fix TIDY build
    
    The Jenkins job that runs the TIDY build doesn't set JAVA8_HOME, which means
    we wind up with an empty JAVA_HOME (different from an unset JAVA_HOME). This
    causes cmake to produce an error:
    
      CMake Error at cmake_modules/FindJavaHome.cmake:54 (message):
        $JAVA_HOME () does not contain bin/java
      Call Stack (most recent call first):
        CMakeLists.txt:988 (find_package)
    
      -- Configuring incomplete, errors occurred!
    
    Change-Id: I19e977c9ddbc25683882ad59766b0e4beb2967e0
    Reviewed-on: http://gerrit.cloudera.org:8080/15445
    Reviewed-by: Adar Dembo <ad...@cloudera.com>
    Tested-by: Adar Dembo <ad...@cloudera.com>
---
 build-support/jenkins/build-and-test.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-support/jenkins/build-and-test.sh b/build-support/jenkins/build-and-test.sh
index 7bea8da..6f0373b 100755
--- a/build-support/jenkins/build-and-test.sh
+++ b/build-support/jenkins/build-and-test.sh
@@ -280,8 +280,10 @@ else
 fi
 
 # Make sure we use JDK8
-export JAVA_HOME=$JAVA8_HOME
-export PATH=$JAVA_HOME/bin:$PATH
+if [ -n "$JAVA8_HOME" ]; then
+  export JAVA_HOME=$JAVA8_HOME
+  export PATH=$JAVA_HOME/bin:$PATH
+fi
 
 # Some portions of the C++ build may depend on Java code, so we may run Gradle
 # while building. Pass in some flags suitable for automated builds; these will