aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jdk10-jtreg-test.yaml11
1 files changed, 9 insertions, 2 deletions
diff --git a/jdk10-jtreg-test.yaml b/jdk10-jtreg-test.yaml
index e3bc0ef92..7a9602d98 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 \