From 6d93e8c5cdebdb380dbec3d6130352190a32593f Mon Sep 17 00:00:00 2001
From: James Guo <junguoj@amazon.com>
Date: Mon, 24 Aug 2020 14:28:41 -0700
Subject: [PATCH] Create test image for Windows

---
 installers/windows/zip/build.gradle | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/installers/windows/zip/build.gradle b/installers/windows/zip/build.gradle
index fee9c315ccb..327260b8bdd 100644
--- 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
 }