commit d53473be1d1d53c2f4dc43257137cc41d17ea30f
author Galina Kistanova <gkistanova@gmail.com> Mon Sep 28 00:05:55 2020 -0700
committer Galina Kistanova <gkistanova@gmail.com> Tue Oct 27 00:25:20 2020 -0700
tree fe9dba0a34dcdd0363bbae02bb2f630711d1452d
parent 7e9f96b61613557f6b10908b4cc943a0901749db

Ported ClangBuilder.

zorg/buildbot/builders/ClangBuilder.py

diff --git a/zorg/buildbot/builders/ClangBuilder.py b/zorg/buildbot/builders/ClangBuilder.py
index 00147e2..692b6b5 100644
--- a/zorg/buildbot/builders/ClangBuilder.py
+++ b/zorg/buildbot/builders/ClangBuilder.py
@@ -302,9 +302,9 @@
     if vs and vs != "manual":
         f.addStep(SetProperty(
             command=builders_util.getVisualStudioEnvironment(vs, vs_target_arch),
-            extract_fn=builders_util.extractSlaveEnvironment))
+            extract_fn=builders_util.extractVSEnvironment))
         assert not env, "Can't have custom builder env vars with VS"
-        env = Property('slave_env')
+        env = Property('vs_env')
 
 
     ############# CLEANING
@@ -405,8 +405,8 @@
         # PATH.
         rel_src_dir = LLVMBuildFactory.pathRelativeTo(f.llvm_srcdir, stage2_build)
         cmake_cmd2 = [cmake, "-G", "Ninja", rel_src_dir,
-                      WithProperties("-DCMAKE_C_COMPILER=%(workdir)s/"+stage1_install+"/bin/"+cc),
-                      WithProperties("-DCMAKE_CXX_COMPILER=%(workdir)s/"+stage1_install+"/bin/"+cxx),
+                      WithProperties("-DCMAKE_C_COMPILER=%(builddir)s/"+stage1_install+"/bin/"+cc),
+                      WithProperties("-DCMAKE_CXX_COMPILER=%(builddir)s/"+stage1_install+"/bin/"+cxx),
                       "-DCMAKE_BUILD_TYPE="+stage2_config,
                       "-DLLVM_ENABLE_ASSERTIONS=True",
                       "-DLLVM_LIT_ARGS="+lit_args,
@@ -454,17 +454,17 @@
                                    env=env))
 
         # Get generated python, lnt
-        python = WithProperties('%(workdir)s/test/sandbox/bin/python')
-        lnt = WithProperties('%(workdir)s/test/sandbox/bin/lnt')
-        lnt_setup = WithProperties('%(workdir)s/test/lnt/setup.py')
+        python = WithProperties('%(builddir)s/test/sandbox/bin/python')
+        lnt = WithProperties('%(builddir)s/test/sandbox/bin/lnt')
+        lnt_setup = WithProperties('%(builddir)s/test/lnt/setup.py')
 
         # Paths
-        sandbox = WithProperties('%(workdir)s/test/sandbox')
-        test_suite_dir = WithProperties('%(workdir)s/test/test-suite')
+        sandbox = WithProperties('%(builddir)s/test/sandbox')
+        test_suite_dir = WithProperties('%(builddir)s/test/test-suite')
 
         # Get latest built Clang (stage1 or stage2)
-        cc = WithProperties('%(workdir)s/'+compiler_path+'/bin/'+cc)
-        cxx = WithProperties('%(workdir)s/'+compiler_path+'/bin/'+cxx)
+        cc = WithProperties('%(builddir)s/'+compiler_path+'/bin/'+cc)
+        cxx = WithProperties('%(builddir)s/'+compiler_path+'/bin/'+cxx)
 
         # LNT Command line (don't pass -jN. Users need to pass both --threads
         # and --build-threads in nt_flags/test_suite_flags to get the same effect)
@@ -479,7 +479,7 @@
             # Append any option provided by the user
             test_suite_cmd.extend(nt_flags)
         else:
-            lit = WithProperties('%(workdir)s/'+stage1_build+'/bin/llvm-lit')
+            lit = WithProperties('%(builddir)s/'+stage1_build+'/bin/llvm-lit')
             test_suite_cmd = [python, lnt, 'runtest', 'test-suite',
                               '--no-timestamp',
                               '--sandbox', sandbox,