< prev index next >
./build.gradle
Print this page
rev 9572 : 8146692: Correct Jake test configuration for cross builds
Reviewed-by: kcr
*** 3751,3786 ****
p.dependencies {
jdk9test group: "junit", name: "junit", version: "4.8.2"
}
! String upper = defaultHostTarget.trim().toUpperCase(Locale.ROOT)
! def targetProperties = project.rootProject.ext[upper]
! // TBD using host - ?
! def platformPrefix = ""
! def modularSdkDirName = "${platformPrefix}modular-sdk"
def modularSdkDir = "${rootProject.buildDir}/${modularSdkDirName}"
def modulesDir = "${modularSdkDir}/modules"
! logger.info("configuring $p.name for test copy");
! def testingDir = "${rootProject.buildDir}/${platformPrefix}testing";
def patchesDir = new File("${testingDir}/modules");
String javaLibraryPath = "${rootProject.buildDir}/sdk/$targetProperties.libDest"
def jdk9patchesBaseDir = new File("${testingDir}/modules/$p.moduleName");
def jdk9patchesTestDir = new File("${testingDir}/tests/$p.moduleName");
! def srcClassesDir = "${p.buildDir}/${platformPrefix}module-classes"
! Task classes = p.task("jdk9CopyClasses", type: Copy, dependsOn: [p.classes]) {
from srcClassesDir
into jdk9patchesBaseDir
}
! Task shims = p.task("jdk9CopyShims", type: Copy, dependsOn: [p.testClasses]) {
//from p.sourceSets.test.output.classesDir
from p.sourceSets.test.output
into jdk9patchesBaseDir
if (patchInc != null) {
include patchInc
--- 3751,3784 ----
p.dependencies {
jdk9test group: "junit", name: "junit", version: "4.8.2"
}
! compileTargets { t ->
! def targetProperties = project.rootProject.ext[t.upper]
! def modularSdkDirName = "${targetProperties.platformPrefix}modular-sdk"
def modularSdkDir = "${rootProject.buildDir}/${modularSdkDirName}"
def modulesDir = "${modularSdkDir}/modules"
! logger.info("configuring $p.name for modular test copy");
! def testingDir = "${rootProject.buildDir}/${targetProperties.platformPrefix}testing";
def patchesDir = new File("${testingDir}/modules");
String javaLibraryPath = "${rootProject.buildDir}/sdk/$targetProperties.libDest"
def jdk9patchesBaseDir = new File("${testingDir}/modules/$p.moduleName");
def jdk9patchesTestDir = new File("${testingDir}/tests/$p.moduleName");
! def srcClassesDir = "${p.buildDir}/${targetProperties.platformPrefix}module-classes"
! Task classes = p.task("jdk9CopyClasses${t.capital}", type: Copy, dependsOn: [p.classes]) {
from srcClassesDir
into jdk9patchesBaseDir
}
! Task shims = p.task("jdk9CopyShims${t.capital}", type: Copy, dependsOn: [p.testClasses]) {
//from p.sourceSets.test.output.classesDir
from p.sourceSets.test.output
into jdk9patchesBaseDir
if (patchInc != null) {
include patchInc
*** 3794,3804 ****
doLast() {
logger.info("project $p.name finished jdk9CopyShims to $jdk9patchesBaseDir");
}
}
! Task tests = p.task("jdk9CopyTests", type: Copy, dependsOn: [p.testClasses]) {
//from p.sourceSets.test.output.classesDir
from p.sourceSets.test.output
into jdk9patchesTestDir
if (patchInc != null) {
exclude patchInc
--- 3792,3802 ----
doLast() {
logger.info("project $p.name finished jdk9CopyShims to $jdk9patchesBaseDir");
}
}
! Task tests = p.task("jdk9CopyTests${t.capital}", type: Copy, dependsOn: [p.testClasses]) {
//from p.sourceSets.test.output.classesDir
from p.sourceSets.test.output
into jdk9patchesTestDir
if (patchInc != null) {
exclude patchInc
*** 3812,3824 ****
doLast() {
logger.info("project $p.name finished jdk9CopyTests to $jdk9patchesTestDir");
}
}
! Task jdk9testsTask = p.task("jdk9tests", dependsOn: [classes, shims, tests]) {
doLast() {
! logger.info("project $p.name finished jdk9testsTask");
}
}
// not found ?
//buildModulesTests.dependsOn(jdk9testsTask);
--- 3810,3822 ----
doLast() {
logger.info("project $p.name finished jdk9CopyTests to $jdk9patchesTestDir");
}
}
! Task jdk9testsTask = p.task("jdk9tests${t.capital}", dependsOn: [classes, shims, tests]) {
doLast() {
! logger.info("project $p.name finished jdk9tests${t.capital}");
}
}
// not found ?
//buildModulesTests.dependsOn(jdk9testsTask);
*** 3880,3889 ****
--- 3878,3889 ----
executable (JAVA9);
}
}
+ }
+
}
/******************************************************************************
* *
*** 3912,3917 ****
--- 3912,3918 ----
println "Properties set for $t.upper"
props.each { println it }
}
}
)
+
}
< prev index next >