diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-25 11:50:07 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-28 15:10:14 +0000 |
| commit | c319125db4f81ad99f9c5deccef362a97f8c4243 (patch) | |
| tree | 176c52dcec2745622c8fd4a053ce2c5c43cda52d /jdk8-jcstress-test.yaml | |
| parent | 32e0c4814588135ec3fe5ccc68aa5063092d591e (diff) | |
jdk: Enable Hotspot client VM runs
Rather than using patches to re-enable the client VM (i.e. C1 compiler),
use the -XX:TieredStopAtLevel=1 option to prevent higher-levels of
compilation. This requires the scripting to be aware of the JVM_VARIANT envvar
and alter the behaviour accordingly, rather than just changing the execution
path.
Change-Id: I9955db0a959788685e050c060d80f0303a917e62
Diffstat (limited to 'jdk8-jcstress-test.yaml')
| -rw-r--r-- | jdk8-jcstress-test.yaml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/jdk8-jcstress-test.yaml b/jdk8-jcstress-test.yaml index 6a74b0d5b1..fce795c055 100644 --- a/jdk8-jcstress-test.yaml +++ b/jdk8-jcstress-test.yaml @@ -26,7 +26,7 @@ name: JVM_VARIANT values: - server -# - client + - client - axis: type: user-defined name: BUILD_TYPE @@ -68,17 +68,26 @@ TEST_TYPE=all TEST_MODE=sanity + # client variant uses server with -XX:TieredStopAtLevel=1 + # zero is a third possible value. + REAL_VARIANT=${JVM_VARIANT/client/server} + JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar rm -rf jdk8u* - tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:${PATH} which java java -version # XXX Don't fail the job if jcstress itself fails. set +e - java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE} + if [ JVM_VARIANT = "server" ]; then + java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-TieredCompilation -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE} + else + java -XX:-RestrictContended -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=128M -jar ${JCSTRESS_JAR} -m ${TEST_MODE} + fi + test_result=$? set -e |