From a73c7715e9d7a9eebf8d755fec4c12cd5aa4c3b6 Mon Sep 17 00:00:00 2001
From: Vitaly Provodin <vitaly.provodin@jetbrains.com>
Date: Wed, 11 Mar 2020 16:53:48 +0700
Subject: [PATCH] JBR-1643 fix intermittent fialures of Windows builds at
 make/Init.gmk:304

combine images and test-image into one make invocation
---
 jb/project/tools/windows/scripts/mkbundles.sh | 6 +++---
 jb/project/tools/windows/scripts/mkimages.sh  | 5 ++---
 jb/project/tools/windows/scripts/pack.sh      | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/jb/project/tools/windows/scripts/mkbundles.sh b/jb/project/tools/windows/scripts/mkbundles.sh
index 3c1176683b3e..e4e37bb19c4c 100755
--- a/jb/project/tools/windows/scripts/mkbundles.sh
+++ b/jb/project/tools/windows/scripts/mkbundles.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/bash -x
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 
-bash -x jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-bash -x jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
\ No newline at end of file
+jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
+jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
\ No newline at end of file
diff --git a/jb/project/tools/windows/scripts/mkimages.sh b/jb/project/tools/windows/scripts/mkimages.sh
index 58f30c84317c..f2eede20639a 100755
--- a/jb/project/tools/windows/scripts/mkimages.sh
+++ b/jb/project/tools/windows/scripts/mkimages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # The following parameters must be specified:
 #   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
@@ -71,8 +71,7 @@ PATH="/usr/local/bin:/usr/bin:${PATH}"
   --disable-ccache \
   --enable-cds=yes || exit 1
 make clean CONF=windows-x86_64-normal-server-release || exit 1
-make JOBS=7 LOG=info images CONF=windows-x86_64-normal-server-release || exit 1
-make JOBS=7 LOG=info test-image || exit 1
+make JOBS=7 LOG=info images CONF=windows-x86_64-normal-server-release test-image || exit 1
 
 JSDK=build/windows-x86_64-normal-server-release/images/jdk
 JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
diff --git a/jb/project/tools/windows/scripts/pack.sh b/jb/project/tools/windows/scripts/pack.sh
index 3d2c5636541a..f4fa3ade69e6 100755
--- a/jb/project/tools/windows/scripts/pack.sh
+++ b/jb/project/tools/windows/scripts/pack.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # The following parameters must be specified:
 #   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6