[llvm-commits] [zorg] r143333 - /zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

[Peter Collingbourne]

Author: pcc
Date: Sun Oct 30 23:22:10 2011
New Revision: 143333

URL: http://llvm.org/viewvc/llvm-project?rev=143333&view=rev
Log:
LLDB: pass environment variables to test command

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

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=143333&r1=143332&r2=143333&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Sun Oct 30 23:22:10 2011
@@ -23,7 +23,7 @@
 
 def getLLDBBuildFactory(triple, outOfDir=False, useTwoStage=False,
                         always_install=False, extra_configure_args=[],
-                        *args, **kwargs):
+                        env={}, *args, **kwargs):
     # FIXME: this code is copied from getClangBuildFactory
     inDir = not outOfDir and not useTwoStage
     if inDir:
@@ -74,6 +74,7 @@
                                                extra_configure_args=
                                                  extra_configure_args+
                                                  ['--enable-targets=host'],
+                                               env=env,
                                                trunk_revision='%(llvmrev)s',
                                                force_checkout=True,
                                                clean=new_llvmrev,
@@ -86,6 +87,7 @@
                            command=['nice', '-n', '10',
                                     'make'],
                            haltOnFailure=True, description="test lldb",
+                           env=env,
                            workdir='%s/tools/lldb/test' % llvm_1_objdir))
 
     return f