diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2017-01-16 16:04:38 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2017-01-16 16:46:41 +0000 |
| commit | 571fe3465df5525bbd385fc98de0a973ec7033c4 (patch) | |
| tree | 7af7a2f376fdda67e7cf2b087b222ee8c8631d4a /jdk9-jtreg-test.yaml | |
| parent | 4d73aa6d9d6dcc1adb06cc923e2a797843fb9449 (diff) | |
jdk: Build, package and use jtreg native libraries
There are some jtreg tests failing because we aren't passing a
"-nativepath:" path with native libraries. These need to be built, so
are built and packaged in jdk9-build-image. They take the name
jdk9-server-release-support.tar.gz, in line with the usual naming scheme.
These changes are only for jdk9. jdk8u appears to work with a different
scheme.
Change-Id: Ib6e84b350a695535c7c897cbfc1ccdd9d60ff621
Diffstat (limited to 'jdk9-jtreg-test.yaml')
| -rw-r--r-- | jdk9-jtreg-test.yaml | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/jdk9-jtreg-test.yaml b/jdk9-jtreg-test.yaml index a9ea9462d7..4b73c53e4c 100644 --- a/jdk9-jtreg-test.yaml +++ b/jdk9-jtreg-test.yaml @@ -99,17 +99,17 @@ # Only set =1 for debugging. use_subcategories=0 - if [ ${use_subcategories} -eq 1 ]; then + if [ ${use_subcategories} -eq 1 ]; then case ${JTREG_CATEGORY} in langtools) JTREG_SUBCATEGORIES=tools/javap/typeAnnotations ;; jdk) JTREG_SUBCATEGORIES=jdk/net/Sockets - ;; + ;; hotspot) JTREG_SUBCATEGORIES=runtime/CommandLine - ;; + ;; esac fi @@ -118,6 +118,7 @@ tar xf incoming/jdk9.tar.gz tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz + tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz # All the output directories and general frobbing # output is to match the existing layout as expected @@ -161,6 +162,20 @@ export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:${PATH} + # For hotspot and jdk we pass a -nativepath: option to jtreg. + # This enables the tests needing native libraries to run. + NATIVEPATH=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib + + if [ $JTREG_CATEGORY = "langtools" ]; then + # The nativepath option we pass must be a valid directory, or + # not at all.` + NATIVE_OPT= + else + # Test executables are expected to be in same directory as libraries + mv $NATIVEPATH/../bin/* $NATIVEPATH + NATIVE_OPT=-nativepath:$NATIVEPATH + fi + PATH=${WORKSPACE}/jtreg/bin:${PATH} which java java -version @@ -177,6 +192,7 @@ -conc:auto \ -r:${report_dir} \ -w:${work_dir} \ + $NATIVE_OPT \ -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n else java -jar jtreg/lib/jtreg.jar \ @@ -188,6 +204,7 @@ -conc:auto \ -r:${report_dir} \ -w:${work_dir} \ + $NATIVE_OPT \ -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n fi |