[llvm-commits] [zorg] r170421 - /zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py

[Duncan Sands]

Author: baldrick
Date: Tue Dec 18 02:29:07 2012
New Revision: 170421

URL: http://llvm.org/viewvc/llvm-project?rev=170421&view=rev
Log:
Use the correct environment when doing the checking.  Hopefully this will fix
the dragonegg buildbots.

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

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=170421&r1=170420&r2=170421&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Tue Dec 18 02:29:07 2012
@@ -182,7 +182,7 @@
                                             ],
                                    description=['test', 'llvm', stage],
                                    haltOnFailure=True, workdir=llvm_obj_dir,
-                                   env=env, timeout=timeout*60))
+                                   env=cur_env, timeout=timeout*60))
 
       f.addStep(WarningCountingShellCommand(name='install.llvm.%s' % stage,
                                             command=['nice', '-n', '10',
@@ -257,7 +257,7 @@
                                             ],
                                    description=['test', 'dragonegg', stage],
                                    haltOnFailure=True, workdir=dragonegg_obj_dir,
-                                   env=env, timeout=timeout*60))
+                                   env=cur_env, timeout=timeout*60))
 
       # Ensure that the following stages use the just built plugin.
       prev_plugin = '%(builddir)s/'+dragonegg_obj_dir+'/dragonegg.so'