File tree Expand file tree Collapse file tree 2 files changed +16
-1
lines changed Expand file tree Collapse file tree 2 files changed +16
-1
lines changed Original file line number Diff line number Diff line change @@ -20,4 +20,6 @@ processArguments
2020setup
2121echo " Verifier for Jira Ticket: OPENJDK-390." | tee $REPORT_FILE
2222echo " Jira Link: https://issues.redhat.com/browse/OPENJDK-390" | tee -a $REPORT_FILE
23- checkJavaHomeEnvVarValid 2>&1 | tee -a $REPORT_FILE
23+ checkJavaHomeEnvExists 2>&1 | tee -a $REPORT_FILE
24+ checkJavaHomeEnvIsFile 2>&1 | tee -a $REPORT_FILE
25+ checkJavaHomeEnvVarValid 2>&1 | tee -a $REPORT_FILE
Original file line number Diff line number Diff line change @@ -987,10 +987,23 @@ function checkJavaHomeEnvVar() {
987987 runOnBaseDir bash -c ' echo $JAVA_HOME'
988988}
989989
990+ function checkJavaHomeEnvExists() {
991+ runOnBaseDir bash -c ' ls -l $JAVA_HOME'
992+ runOnBaseDir bash -c ' ls -l $JAVA_HOME/bin'
993+ runOnBaseDir bash -c ' ls -l $JAVA_HOME/bin/java'
994+ }
995+
996+ function checkJavaHomeEnvIsFile() {
997+ runOnBaseDir bash -c ' test -d $JAVA_HOME'
998+ runOnBaseDir bash -c ' test -d $JAVA_HOME/bin'
999+ runOnBaseDir bash -c ' test -f $JAVA_HOME/bin/java'
1000+ }
1001+
9901002function checkJavaHomeEnvVarValid() {
9911003 runOnBaseDir bash -c ' $JAVA_HOME/bin/java -version'
9921004}
9931005
1006+
9941007function otherUserRun() {
9951008 set +e
9961009 # There is no test here. The call's output must be checked.
You can’t perform that action at this time.
0 commit comments