[zorg] Pass environment to getPollyBuildFactory and getAOSPBuildFactory

[kparzysz]

Summary

This will allow setting LD_LIBRARY_PATH.

I'm updating compilers on hexagon-build-02 and hexagon-build-03 and I need to make sure that the correct LD_LIBRARY_PATH is set.

I'm not a buildbot expert, so this is more of a "I hope this works" type of a patch...

[kparzysz]

Ping.

[gkistanova]

Hello Krzysztof,

Looks good, assuming you want to make builders use the locally set LD_LIBRARY_PATH env, and not push a particular value down to a builder.
Please feel free to commit once you will fix the nitpick.

zorg/buildbot/builders/PollyBuilder.py

39

You do not need to check for None here. You do not need to update if the given array is empty either.

if env:

would do.

zorg/buildbot/builders/AOSPBuilder.py

def getAOSPBuildFactory(
     clang_dir = target_clang
 
     # Build Clang for AOSP target build
     if build_clang:
         f = PollyBuilder.getPollyBuildFactory(clean=True,
                                               install=True,
                                               make='ninja',
                                               jobs=jobs,
+                                              env=env,
                                               extraCmakeArgs=extra_cmake_args)
         clang_dir = 'llvm.inst/bin'
 
     # Restore AOSP repo to a clean state
     if clean:
         f.addStep(ShellCommand(name="clean-repo",
                                command=['repo', 'forall', '-c',
                                         'git reset --hard; git clean -fdx'],

zorg/buildbot/builders/PollyBuilder.py

 from zorg.buildbot.builders import ClangBuilder
 
 def getPollyBuildFactory(
     clean=False,
     install=False,
     make='make',
     jobs=None,
     checkAll=False,
+    env=None,
     extraCmakeArgs=[]):
     llvm_srcdir = "llvm.src"
     llvm_objdir = "llvm.obj"
     llvm_instdir = "llvm.inst"
     polly_srcdir = '%s/tools/polly' % llvm_srcdir
     clang_srcdir = '%s/tools/clang' % llvm_srcdir
     jobs_cmd = []
     if jobs is not None:
         jobs_cmd = ["-j"+str(jobs)]
     build_cmd = [make] + jobs_cmd
     install_cmd = [make, 'install'] + jobs_cmd
     check_all_cmd = [make, 'check-all'] + jobs_cmd
     check_polly_cmd = [make, 'check-polly'] + jobs_cmd
     cmake_install = []
     if install:
         cmake_install = ["-DCMAKE_INSTALL_PREFIX=../%s" % llvm_instdir]
+    # Prepare environmental variables. Set here all env we want everywhere.
+    merged_env = {
+                   'TERM' : 'dumb'     # Make sure Clang doesn't use color escape sequences.
+                 }
+    if env is not None:
+        merged_env.update(env)  # Overwrite pre-set items with the given ones, so user can set anything.
 
     f = buildbot.process.factory.BuildFactory()
     # Determine the build directory.
     f.addStep(buildbot.steps.shell.SetProperty(name="get_builddir",
                                                command=["pwd"],
                                                property="builddir",
                                                description="set build dir",
                                                workdir="."))
f.addStep(SVN(name='svn-polly',
                   workdir=polly_srcdir))
 
     # Clean build dir
     if clean:
         f.addStep(ShellCommand(name='clean-build-dir',
                                command=['rm', '-rf', llvm_objdir],
                                warnOnFailure=True,
                                description=["clean build dir"],
-                               workdir='.'))
+                               workdir='.',
+                               env=merged_env))
 
     # Create configuration files with cmake
     f.addStep(ShellCommand(name="create-build-dir",
                            command=["mkdir", "-p", llvm_objdir],
                            haltOnFailure=False,
                            description=["create build dir"],
-                           workdir="."))
+                           workdir=".",
+                           env=merged_env))
     cmakeCommand = ["cmake", "../%s" %llvm_srcdir,
                     "-DCMAKE_COLOR_MAKEFILE=OFF",
                     "-DPOLLY_TEST_DISABLE_BAR=ON",
                     "-DPOLLY_ENABLE_GPGPU_CODEGEN=ON",
                     "-DCMAKE_BUILD_TYPE=Release"] + cmake_install + extraCmakeArgs
     f.addStep(ShellCommand(name="cmake-configure",
                            command=cmakeCommand,
                            haltOnFailure=False,
                            description=["cmake configure"],
-                           workdir=llvm_objdir))
+                           workdir=llvm_objdir,
+                           env=merged_env))
 
     # Build
     f.addStep(ShellCommand(name="build",
                            command=build_cmd,
                            haltOnFailure=True,
                            description=["build"],
-                           workdir=llvm_objdir))
+                           workdir=llvm_objdir,
+                           env=merged_env))
 
     # Clean install dir
     if install and clean:
         f.addStep(ShellCommand(name='clean-install-dir',
                                command=['rm', '-rf', llvm_instdir],
                                haltOnFailure=False,
                                description=["clean install dir"],
-                               workdir='.'))
+                               workdir='.',
+                               env=merged_env))
 
     # Install
     if install:
         f.addStep(ShellCommand(name="install",
                                command=install_cmd,
                                haltOnFailure=False,
                                description=["install"],
-                               workdir=llvm_objdir))
+                               workdir=llvm_objdir,
+                               env=merged_env))
 
     # Test
     if checkAll:
         f.addStep(ShellCommand(name="check_all",
                                command=check_all_cmd,
                                haltOnFailure=False,
                                description=["check all"],
-                               workdir=llvm_objdir))
+                               workdir=llvm_objdir,
+                               env=merged_env))
     else:
         f.addStep(ShellCommand(name="check_polly",
                                command=check_polly_cmd,
                                haltOnFailure=False,
                                description=["check polly"],
-                               workdir=llvm_objdir))
+                               workdir=llvm_objdir,
+                               env=merged_env))
 
     return f
 
 def AddExternalPollyBuildFactory(f, llvm_installdir, build_type = "Release"):
     polly_srcdir = 'polly.src'
     polly_objdir = 'polly.obj'
     polly_installdir = 'polly.install'