diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-02-22 16:22:26 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-02-22 16:22:26 +0000 |
| commit | 0c115966ff4288e42411de0544d9e6be6b9f1e79 (patch) | |
| tree | 34a1af0de8975d363a54aabcc7447dc019aa1a68 /jdkX-jtreg-test.yaml | |
| parent | bf2c824c247cc426f4f824872083e56f4af9de0c (diff) | |
jdk: Fix hotspot jtreg tests.
Try with jdk JDK first.
Change-Id: I5b9615ca8cd0b16bd2f773d76ca84f0d3d5fcfdf
Diffstat (limited to 'jdkX-jtreg-test.yaml')
| -rw-r--r-- | jdkX-jtreg-test.yaml | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/jdkX-jtreg-test.yaml b/jdkX-jtreg-test.yaml index 5f915a03..b3963d9f 100644 --- a/jdkX-jtreg-test.yaml +++ b/jdkX-jtreg-test.yaml @@ -105,25 +105,6 @@ 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/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 @@ -194,14 +175,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} \ @@ -211,10 +192,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 \ @@ -225,7 +206,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 |