Create test image for Windows

corretto · Aug 25, 2020 · 6d93e8c · 6d93e8c
1 parent 2f85d9a
commit 6d93e8c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/installers/windows/zip/build.gradle b/installers/windows/zip/build.gradle
@@ -57,7 +57,7 @@ task executeBuild(type: Exec) {
     dependsOn configureBuild
     workingDir buildRoot
 
-    commandLine 'make', 'clean', 'images'
+    commandLine 'make', 'clean', 'images', 'test-image-hotspot-jtreg-native', 'test-image-jdk-jtreg-native'
 }
 
 task copyImage(type: Copy) {
@@ -67,8 +67,17 @@ task copyImage(type: Copy) {
     into "$buildRoot/build"
 }
 
-task packageJdk(type: Zip) {
+task packageTestImage(type: Zip) {
     dependsOn copyImage
+    archiveName "${project.correttoTestImageArchiveName}.zip"
+    from("${copyImage.destinationDir}/test") {
+        include '**'
+    }
+    into project.correttoTestImageArchiveName
+}
+
+task packageBuildResults(type: Zip) {
+    dependsOn packageTestImage
     archiveName  = "unsigned-jdk-image.zip"
 
     from("${copyImage.destinationDir}/jdk") {
@@ -84,5 +93,5 @@ task packageJdk(type: Zip) {
 }
 
 artifacts {
-    archives packageJdk
+    archives packageBuildResults
 }