diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-04-10 15:25:15 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-04-10 15:25:15 +0100 |
| commit | c3a214e4dfb3830790c73937defc7d1eaa2a0c60 (patch) | |
| tree | e8a5ce845fe232796619c3b619f8fb2a531b9670 | |
| parent | ff9a3d40ef0c082abf221f40bcab1689eb2b5e86 (diff) | |
jdk: Fix jdk10 hotspot runs
There were some changes that needed propogated to jdk10.
Change-Id: Ifc11feb4a698fc36fbe7fec837c72c562600a32e
| -rw-r--r-- | jdk10-jtreg-test.yaml | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/jdk10-jtreg-test.yaml b/jdk10-jtreg-test.yaml index 73a8c67a4b..7b9d3f2283 100644 --- a/jdk10-jtreg-test.yaml +++ b/jdk10-jtreg-test.yaml @@ -104,27 +104,8 @@ JCSTRESS=$PWD/incoming/jcstress.jar - # Only set =1 for debugging. - use_subcategories=0 - - 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 - - : ${JTREG_SUBCATEGORIES:=.} - - tar xf incoming/jdk10.tar.gz - tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf incoming/jdkX.tar.gz + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz @@ -193,14 +174,14 @@ # hotspot splits its tests into gtest jtreg tests. We just do jtreg. if [ $JTREG_CATEGORY == "hotspot" ]; then - TEST_SUBDIR=${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps + TEST_SUBDIR=test/${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps else - TEST_SUBDIR=${JTREG_CATEGORY} + TEST_SUBDIR=test/${JTREG_CATEGORY} fi if [ $JVM_VARIANT = "server" ]; then java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir}/test/${TEST_SUBDIR} \ + -dir:${src_dir} \ -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ -vmoption:-XX:-TieredCompilation \ -testjdk:${IMAGE_DIR} \ @@ -210,10 +191,10 @@ -w:${work_dir} \ $NATIVE_OPT \ -timeout:8 \ - -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n + -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n else java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir}/test/${TEST_SUBDIR} \ + -dir:${src_dir} \ -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ -vmoption:-XX:+TieredCompilation \ -vmoption:-XX:TieredStopAtLevel=1 \ @@ -224,7 +205,7 @@ -w:${work_dir} \ $NATIVE_OPT \ -timeout:8 \ - -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n + -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR} | cat -n fi # Kill leftover jstatd processes. |