diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2017-10-05 09:25:32 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2017-10-05 09:25:32 +0100 |
| commit | 22398720a3d75fe95ba83f5bea082f22d7f0b187 (patch) | |
| tree | eb732fc17abc3feb778854ae9c03876d54caf907 /jdk10-jtreg-test.yaml | |
| parent | 8c9599bbb118d66677ceab5e798858355bf7bd2d (diff) | |
jdk: jdk10 jtreg - fix subdir assumption
The hotspot tests have a different structure from langtools and jdk,
having an additional layer "jtreg" and "gtest". We just run the jtreg
tests.
Change-Id: I620356e04ce216b29b30276c69b3fc2fb0c63369
Diffstat (limited to 'jdk10-jtreg-test.yaml')
| -rw-r--r-- | jdk10-jtreg-test.yaml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/jdk10-jtreg-test.yaml b/jdk10-jtreg-test.yaml index e3bc0ef92a..7a9602d98b 100644 --- a/jdk10-jtreg-test.yaml +++ b/jdk10-jtreg-test.yaml @@ -195,9 +195,16 @@ # Ignore error in jtreg final result. set +e + # hotspot splits its tests into gtest jtreg tests. We just do jtreg. + if [ $JTREG_CATEGORY == "hotspot" ]; then + TEST_SUBDIR=${JTREG_CATEGORY}/jtreg + else + TEST_SUBDIR=${JTREG_CATEGORY} + fi + if [ $JVM_VARIANT = "server" ]; then java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir}/test/${JTREG_CATEGORY}/jtreg \ + -dir:${src_dir}/test/${TEST_SUBDIR} \ -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ -vmoption:-XX:-TieredCompilation \ -testjdk:${IMAGE_DIR} \ @@ -210,7 +217,7 @@ -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n else java -jar jtreg/lib/jtreg.jar \ - -dir:${src_dir}/test/${JTREG_CATEGORY}/jtreg \ + -dir:${src_dir}/test/${TEST_SUBDIR} \ -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \ -vmoption:-XX:+TieredCompilation \ -vmoption:-XX:TieredStopAtLevel=1 \ |