[zorg] r241168 - [CMakeBot] Deepcopy on test-suite environment

Renato Golin renato.golin at linaro.org
Wed Jul 1 08:52:22 PDT 2015


Author: rengolin
Date: Wed Jul  1 10:52:22 2015
New Revision: 241168

URL: http://llvm.org/viewvc/llvm-project?rev=241168&view=rev
Log:
[CMakeBot] Deepcopy on test-suite environment

The default shallow copy was messing up the environment of new builds
and wasn't detected because the builds were already prepared on the
lnt buildbots. Tested on my local buildmaster from a fresh build.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=241168&r1=241167&r2=241168&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jul  1 10:52:22 2015
@@ -1,5 +1,6 @@
 import buildbot
 import buildbot.process.factory
+import copy
 import os
 
 from buildbot.process.properties import WithProperties, Property
@@ -716,7 +717,7 @@ def getClangCMakeBuildFactory(
             if testerName:
                 test_suite_cmd.extend(['--no-machdep-info', testerName])
         # CC and CXX are needed as env for build-tools
-        test_suite_env = env
+        test_suite_env = copy.deepcopy(env)
         test_suite_env['CC'] = cc
         test_suite_env['CXX'] = cxx
 





More information about the llvm-commits mailing list