[zorg] r279592 - Make sure host compilers are clean

Chris Matthews via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 23 17:01:42 PDT 2016


Author: cmatthews
Date: Tue Aug 23 19:01:41 2016
New Revision: 279592

URL: http://llvm.org/viewvc/llvm-project?rev=279592&view=rev
Log:
Make sure host compilers are clean

In some places the host-compiler was being checked out in a dirty
directory, don't do that!

Modified:
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=279592&r1=279591&r2=279592&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Tue Aug 23 19:01:41 2016
@@ -633,6 +633,8 @@ def fetch_compiler():
     print "Decompressing..."
     if not os.path.exists(conf.workspace + "/host-compiler"):
         os.mkdir(conf.workspace + "/host-compiler")
+    else:
+        shutil.rmtree(conf.workspace + "/host-compiler")
     run_cmd(conf.workspace + "/host-compiler/", ['tar', 'zxf', "../" + local_name])
     os.unlink(local_name)
     footer()
@@ -678,6 +680,7 @@ def build_upload_artifact():
 
     run_cmd(conf.workspace, ln_cmd)
 
+
 def run_cmd(working_dir, cmd, env=None, sudo=False, err_okay=False):
     """Run a command in a working directory, and make sure it returns zero."""
     assert type(cmd) == list, "Not a list: {}".format(type(cmd))




More information about the llvm-commits mailing list