aboutsummaryrefslogtreecommitdiff
path: root/jtreg-build.yaml
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2017-06-22 09:49:53 +0100
committerStuart Monteith <stuart.monteith@linaro.org>2017-06-22 09:49:53 +0100
commitcad50749b47ded95d486b5b9506e7ea86a310b7c (patch)
treef08e846ddb98c39d3e6f41dca45427b85460d374 /jtreg-build.yaml
parent1ca167f78945c616eca6066c8bcc020085e5a200 (diff)
jdk: Fix jtreg builds by adding javahelp
Need to pull down javahelp separately, as it is no longer in jtharness as of version 5.0. Change-Id: Iaecfecdceadf3f9aae8f4e9745055ed274694a6d
Diffstat (limited to 'jtreg-build.yaml')
-rw-r--r--jtreg-build.yaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/jtreg-build.yaml b/jtreg-build.yaml
index 3507723e..59e927b1 100644
--- a/jtreg-build.yaml
+++ b/jtreg-build.yaml
@@ -66,6 +66,12 @@
tar xzf jtharness-5.0.tar.gz jtharness/lib
fi
+ if [ ! -d javahelp ]; then
+ mkdir -p javahelp/lib
+ wget http://central.maven.org/maven2/javax/help/javahelp/2.0.05/javahelp-2.0.05.jar
+ mv javahelp-2.0.05.jar javahelp/lib/jh.jar
+ fi
+
if [ ! -d junit ]; then
mkdir junit
wget http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar -O junit/junit.jar
@@ -111,7 +117,7 @@
export JDK17HOME=$(dirname $(java -XshowSettings:properties |& \
grep java.home | sed 's,^.*java.home = \(.*\),\1,'))
export JAVAHELP_HOME=$PWD/jtharness
- export JAVAHELP_JAR=$PWD/jtharness/lib/jh.jar
+ export JAVAHELP_JAR=$PWD/javahelp/lib/jh.jar
export JAVATEST_HOME=$PWD/jtharness
export JAVATEST_JAR=$PWD/jtharness/lib/javatest.jar
export JAVAHARNESS_HOME=$PWD/jtharness