From b534ea6f219b3d885885a9c03eedf7fd6c660b6d Mon Sep 17 00:00:00 2001
From: Eugene Rozenfeld <erozen@microsoft.com>
Date: Wed, 19 Feb 2020 18:08:41 -0800
Subject: [PATCH] Check return code of bootstrap script in format.py.

Formatting jobs run format.py script, which calls bootstrap.{cmd/sh}
from jitutils. This change adds a check for return code of the call and
returns an error code from format.py if bootstrap.{cmd/sh} failed.
---
 src/coreclr/tests/scripts/format.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/coreclr/tests/scripts/format.py b/src/coreclr/tests/scripts/format.py
index 2f122b485af37..c25e904f33288 100644
--- a/src/coreclr/tests/scripts/format.py
+++ b/src/coreclr/tests/scripts/format.py
@@ -61,6 +61,15 @@ def del_rw(action, name, exc):
     os.chmod(name, 0o651)
     os.remove(name)
 
+def cleanup(jitUtilsPath, bootstrapPath):
+    if os.path.isdir(jitUtilsPath):
+        print("Deleting " + jitUtilsPath)
+        shutil.rmtree(jitUtilsPath, onerror=del_rw)
+
+    if os.path.isfile(bootstrapPath):
+        print("Deleting " + bootstrapPath)
+        os.remove(bootstrapPath)
+
 def main(argv):
     parser = argparse.ArgumentParser()
     required = parser.add_argument_group('required arguments')
@@ -103,9 +112,7 @@ def main(argv):
 
     jitUtilsPath = os.path.join(coreclr, "jitutils")
 
-    if os.path.isdir(jitUtilsPath):
-        print("Deleting " + jitUtilsPath)
-        shutil.rmtree(jitUtilsPath, onerror=del_rw)
+    cleanup(jitUtilsPath, '')
 
     if platform == 'Linux' or platform == 'OSX':
         bootstrapFilename = "bootstrap.sh"
@@ -156,6 +163,11 @@ def main(argv):
             proc = subprocess.Popen([bootstrapPath], env=my_env)
             output,error = proc.communicate()
 
+        if proc.returncode != 0:
+            cleanup('', bootstrapPath)
+            print("Bootstrap failed")
+            return -1
+
         # Run jit-format
 
         returncode = 0
@@ -212,13 +224,7 @@ def main(argv):
         proc = subprocess.Popen(["git", "diff", "--patch", "-U20", "--", jitSrcPath], env=my_env, stdout=patchFile)
         output,error = proc.communicate()
 
-    if os.path.isdir(jitUtilsPath):
-        print("Deleting " + jitUtilsPath)
-        shutil.rmtree(jitUtilsPath, onerror=del_rw)
-
-    if os.path.isfile(bootstrapPath):
-        print("Deleting " + bootstrapPath)
-        os.remove(bootstrapPath)
+    cleanup(jitUtilsPath, bootstrapPath)
 
     if returncode != 0:
         print("There were errors in formatting. Please run jit-format locally with: \n")