aboutsummaryrefslogtreecommitdiff
path: root/jtreg-build.yaml
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2017-12-01 11:45:06 +0000
committerStuart Monteith <stuart.monteith@linaro.org>2017-12-01 11:45:06 +0000
commitee50bf04e8ad78d0a3e014880fd08b5abc9662a3 (patch)
tree030759663eb25e6f695256ba88d9ee6d81d36f4a /jtreg-build.yaml
parent4776995ae16b01966a9e61e81f17adf043a6043c (diff)
jdk: jtreg change JDK envvar
Change the env var of the JDK location, and echo it for diagnosis. Change-Id: If12a82687efd4118c6356b921db1377a189f8db5
Diffstat (limited to 'jtreg-build.yaml')
-rw-r--r--jtreg-build.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/jtreg-build.yaml b/jtreg-build.yaml
index c241b174..693df879 100644
--- a/jtreg-build.yaml
+++ b/jtreg-build.yaml
@@ -134,7 +134,7 @@
# Parameters for makefile build, which includes asmtools.jar in
# classpath in manifest.
# java and ant's home directories are found from the commands.
- export JDK17HOME=$(dirname $(java -XshowSettings:properties |& \
+ export JDKHOME=$(dirname $(java -XshowSettings:properties |& \
grep java.home | sed 's,^.*java.home = \(.*\),\1,'))
export JAVATEST_HOME=$PWD/jtharness
export JAVATEST_JAR=$PWD/jtharness/lib/javatest.jar
@@ -149,6 +149,7 @@
export JCOV_JAR=$PWD/../jcov/JCOV_BUILD/jcov_3.0/jcov.jar
export JCOV_NETWORK_SAVER_JAR=$PWD/../jcov/JCOV_BUILD/jcov_3.0/jcov_network_saver.jar
+ echo JDKHOME=\"$JDKHOME\"
# Makefile expects files that are not supplied from the packages we
# are downloading. Create dummy versions to keep it happy.