./build.gradle

rev 9572 : 8146692: Correct Jake test configuration for cross builds
Reviewed-by: kcr

@@ -3751,36 +3751,34 @@
 
     p.dependencies {
         jdk9test group: "junit", name: "junit", version: "4.8.2"
     }
 
-    String upper = defaultHostTarget.trim().toUpperCase(Locale.ROOT)
-    def targetProperties = project.rootProject.ext[upper]
+    compileTargets { t ->
 
-    // TBD using host - ?
-    def platformPrefix = ""
+        def targetProperties = project.rootProject.ext[t.upper]
    
-    def modularSdkDirName = "${platformPrefix}modular-sdk"
+        def modularSdkDirName = "${targetProperties.platformPrefix}modular-sdk"
     def modularSdkDir = "${rootProject.buildDir}/${modularSdkDirName}"
     def modulesDir = "${modularSdkDir}/modules"
 
-    logger.info("configuring $p.name for test copy");
+        logger.info("configuring $p.name for modular test copy");
 
-    def testingDir = "${rootProject.buildDir}/${platformPrefix}testing";
+        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}/${platformPrefix}module-classes"
-    Task classes =  p.task("jdk9CopyClasses", type: Copy, dependsOn: [p.classes]) {
+        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", type: Copy, dependsOn: [p.testClasses]) {
+        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,11 +3792,11 @@
         doLast() {
             logger.info("project $p.name finished jdk9CopyShims to $jdk9patchesBaseDir");
         }
     }
 
-    Task tests =  p.task("jdk9CopyTests", type: Copy, dependsOn: [p.testClasses]) {
+        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,13 +3810,13 @@
         doLast() {
             logger.info("project $p.name finished jdk9CopyTests to $jdk9patchesTestDir");
         }
     }
 
-    Task jdk9testsTask =  p.task("jdk9tests", dependsOn: [classes, shims, tests]) {
+        Task jdk9testsTask =  p.task("jdk9tests${t.capital}", dependsOn: [classes, shims, tests]) {
         doLast() {
-            logger.info("project $p.name finished jdk9testsTask");
+                logger.info("project $p.name finished jdk9tests${t.capital}");
         }
     }
 
     // not found ?
     //buildModulesTests.dependsOn(jdk9testsTask);

@@ -3880,10 +3878,12 @@
             executable (JAVA9);
 
           }
     }
 
+    }
+
 }
 
 
 /******************************************************************************
  *                                                                            *

@@ -3912,6 +3912,7 @@
                 println "Properties set for $t.upper"
                 props.each { println it }
             }
         }
     )
+
 }