Add test build for Java 10.

We still require `--add-opens java.base/jdk.internal.loader=ALL-UNNAMED` to be set.  Something we should look into fixing somehow.
This commit is contained in:
Tyler Benson 2018-07-12 13:20:39 -04:00
parent 77717d305b
commit da2c54e8e8
3 changed files with 32 additions and 3 deletions

View File

@ -125,6 +125,13 @@ jobs:
- TEST_TASK: testJava9 latestDepTestJava9 jacocoTestReport jacocoTestCoverageVerification - TEST_TASK: testJava9 latestDepTestJava9 jacocoTestReport jacocoTestCoverageVerification
- INSTALL_ZULU: zulu-9 - INSTALL_ZULU: zulu-9
test_10:
<<: *default_test_job
environment:
- JAVA10_HOME: /usr/lib/jvm/zulu-10-amd64
- TEST_TASK: testJava10 latestDepTestJava10 jacocoTestReport jacocoTestCoverageVerification
- INSTALL_ZULU: zulu-10
agent_integration_tests: agent_integration_tests:
<<: *defaults <<: *defaults
docker: docker:
@ -245,6 +252,12 @@ workflows:
filters: filters:
tags: tags:
only: /.*/ only: /.*/
- test_10:
requires:
- build
filters:
tags:
only: /.*/
- agent_integration_tests: - agent_integration_tests:
requires: requires:
@ -265,6 +278,7 @@ workflows:
- test_7 - test_7
- test_8 - test_8
- test_9 - test_9
- test_10
- agent_integration_tests - agent_integration_tests
filters: filters:
branches: branches:
@ -277,6 +291,7 @@ workflows:
- test_7 - test_7
- test_8 - test_8
- test_9 - test_9
- test_10
- agent_integration_tests - agent_integration_tests
filters: filters:
branches: branches:

View File

@ -38,7 +38,6 @@ description = 'dd-trace-java'
task traceAgentTest {} task traceAgentTest {}
task latestDepTest {} task latestDepTest {}
task latestDepTestJava9 {}
// Applied here to allow publishing of artifactory build info // Applied here to allow publishing of artifactory build info
apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/publish.gradle"

View File

@ -44,7 +44,7 @@ repositories {
dependencies { dependencies {
testCompile deps.junit testCompile deps.junit
testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+' testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22' testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
testCompile deps.spock testCompile deps.spock
testCompile deps.groovy testCompile deps.groovy
@ -118,7 +118,7 @@ project.ext.testJava8Only = []
project.ext.testJava8Minimum = [] project.ext.testJava8Minimum = []
tasks.withType(Test) { tasks.withType(Test) {
if (name.endsWith("Java7") || name.endsWith("Java9")) { if (name.endsWith("Java7") || name.endsWith("Java9") || name.endsWith("Java10")) {
return return
} }
@ -152,6 +152,21 @@ tasks.withType(Test) {
} }
tasks.check.dependsOn testJ9 tasks.check.dependsOn testJ9
} }
def java10Home = System.getenv("JAVA10_HOME")
if (java10Home != null) {
def testJ10 = task "${cloned.name}Java10"(type: cloned.class) {
description "Runs $cloned.name under java 10"
// TODO: Pull from environment variable:
executable = "$java10Home/bin/java"
jvmArgs '--add-opens'
jvmArgs 'java.base/jdk.internal.loader=ALL-UNNAMED'
project.afterEvaluate {
exclude project.testJava8Only
}
}
tasks.check.dependsOn testJ10
}
} }
apply from: "$rootDir/gradle/checkstyle.gradle" apply from: "$rootDir/gradle/checkstyle.gradle"