diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2017-06-22 14:50:07 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2017-06-22 14:51:16 +0100 |
| commit | 108f2e9158b7176bd59357c55fc62be5964cdbb9 (patch) | |
| tree | 5bea7a47c6a3a874287a8e99f4a934c07f028514 /jtreg-build.yaml | |
| parent | 499b68b90900ff55867e91883384b6963ebf492d (diff) | |
jdk: Fix jtreg jcommander setup
It is better to set JCOMMANDER_JAR than copy it after the build. In
future, we'll be able to run tests. Also update version downloaded.
Change-Id: I852cb0c7854482b613cc7c79e3055a3f67cb6408
Diffstat (limited to 'jtreg-build.yaml')
| -rw-r--r-- | jtreg-build.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jtreg-build.yaml b/jtreg-build.yaml index 59e927b19a..7961b4d452 100644 --- a/jtreg-build.yaml +++ b/jtreg-build.yaml @@ -84,7 +84,7 @@ if [ ! -d jcommander ]; then mkdir jcommander - wget http://repo1.maven.org/maven2/com/beust/jcommander/1.48/jcommander-1.48.jar -O jcommander/jcommander.jar + wget http://repo1.maven.org/maven2/com/beust/jcommander/1.72/jcommander-1.72.jar -O jcommander/jcommander.jar fi ls -lash @@ -127,7 +127,7 @@ export JUNIT_JAR=$PWD/junit/junit.jar export ANTHOME=$(ant -diagnostics | grep ant.home | \ sed 's,^.*: \(.*\),\1,' | uniq) - + export JCOMMANDER_JAR=$PWD/jcommander/jcommander.jar # Makefile expects files that are not supplied from the packages we # are downloading. Create dummy versions to keep it happy. @@ -141,7 +141,6 @@ rm -f *.zip rm -f *.tar.gz - cp jcommander/jcommander.jar ./build/images/jtreg/lib chmod u+x ./build/images/jtreg/bin/* ls -lash |