[PATCH] [zorg] Rev1: Fix get slave environment in LLDB Windows builder.

[Zachary Turner]

Thanks a million times for working on this.  I never would have figured out the part of about the slave environment on my own :)


REPOSITORY
  rL LLVM

================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:37
@@ -14,1 +36,3 @@
+
+def generateVisualStudioEnvironment(vs_common=r"%VS120COMNTOOLS%", target_arch=None):
     arch_arg = {'x86': 'x86', 'x64': 'amd64', 'amd64': 'amd64'}.get(target_arch, None)
----------------
I'm not crazy about this %VS120COMNTOOLS% usage.  This is going to break when we switch to a different version of Visual Studio.  In getLLDBWindowsCMakeBuildFactory(), we're already specifying a path to the Visual Studio installation folder, so I think we should just pass that into this function.  This way, one can easily make two builders with different versions of Visual Studio on the same slave by just specifying a different value for vs_install_dir when creating the factory.

================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:53
@@ -41,3 +52,3 @@
             # Source directory containing a built python
-            python_source_dir=r'C:\src\python',
+            python_source_dir=r'C:/src/python',
 
----------------
While it will probably work either way, any reason why this was necessary?

================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:74
@@ -58,14 +73,3 @@
     # MSVC LD.EXE cannot link executables with DWARF debug info.
-    f.addStep(SVN(name='svn-llvm',
-                  mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
-                  defaultBranch='trunk',
-                  workdir='llvm'))
-    f.addStep(SVN(name='svn-clang',
-                  mode='update', baseURL='http://llvm.org/svn/llvm-project/cfe/',
-                  defaultBranch='trunk',
-                  workdir='llvm/tools/clang'))
-    f.addStep(SVN(name='svn-lldb',
-                  mode='update', baseURL='http://llvm.org/svn/llvm-project/lldb/',
-                  defaultBranch='trunk',
-                  workdir='llvm/tools/lldb'))
+    f = getLLDBSource(f,'llvm')
 
----------------
Can you move the comment inside the function?

================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:127-132
@@ -123,1 +126,8 @@
 
+    f.addStep(ShellCommand(name='install',
+                          command=[ninja_cmd,'install'],
+                          haltOnFailure=False,
+                          description='ninja install',
+                          workdir=build_dir,
+                          env=Property('slave_env')))
+
----------------
Is the install necessary?  What happens if we don't install?  I've never done it before, so it seems like an unnecessary step unless I'm missing something.

================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:134-140
@@ +133,9 @@
+
+    f.addStep(ShellCommand(name='test',
+                          command=[ninja_cmd,'check-lldb'],
+                          haltOnFailure=False,
+                          flunkOnFailure=False,
+                          description='ninja test',
+                          workdir=build_dir,
+                          env=Property('slave_env')))
+
----------------
Can getLLDBWindowsCMAKEBuildFactory take a boolean that says whether to run tests?

http://reviews.llvm.org/D7077

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/