diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-16 16:25:21 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-18 15:07:12 +0100 |
| commit | 087485e32c5b98cf938634ef7f6b047594dab4fe (patch) | |
| tree | 863d82d8b0263e279fbb54bafb032b7be5e149e2 /jdkX-jcstress-test.yaml | |
| parent | 80c34418134366450d402fda8d8d79227b972de8 (diff) | |
jdk: Test only with default tier options.
Test with the default JVM. Don't force runs to use C1 or C2.
Change-Id: I2264dfa593d858ee37432615d3e6a3022ab223dd
Diffstat (limited to 'jdkX-jcstress-test.yaml')
| -rw-r--r-- | jdkX-jcstress-test.yaml | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/jdkX-jcstress-test.yaml b/jdkX-jcstress-test.yaml index 5d9a8a58..61b4ec2b 100644 --- a/jdkX-jcstress-test.yaml +++ b/jdkX-jcstress-test.yaml @@ -28,12 +28,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server - - client - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -61,14 +55,10 @@ TEST_TYPE=all DEPS=$HOME/workspace/jdkX-get-deps - # client variant uses server with -XX:TieredStopAtLevel=1 - # zero is a third possible value. - REAL_VARIANT=${JVM_VARIANT/client/server} - JCSTRESS_JAR=$DEPS/jcstress.jar rm -rf jdkX* - 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 - export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:${PATH} which java java -version @@ -83,7 +73,7 @@ rm -rf out mkdir out - out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE} + out_dirname=jcstress-results-${BUILD_TYPE} rm -rf ${out_dirname} mkdir -p ${out_dirname} |