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

Galina gkistanova at gmail.com
Mon Jan 26 14:15:29 PST 2015


REPOSITORY
  rL LLVM

================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:42
@@ -41,3 +41,3 @@
     
-    vcvars_command = "\"" + os.path.join(vs_common, '..','..','VC', 'vcvarsall.bat') + "\""
-    vcvars_command = "%s %s && set" % (vcvars_command, arch_arg)
+    vcvars_command = "\"" + r"\\".join((vs_common, '..','..','VC', 'vcvarsall.bat')) + "\""
+    vcvars_command = r"%s %s && set" % (vcvars_command, arch_arg)
----------------
os.path.join runs in the context of the buildmaster, which is MacOS for the LLVM buildbot.
Having the directory separator defined explicitly for Windows is the right fix for this case.


================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:56
@@ -55,3 +55,3 @@
             # Default values for VS devenv and build configuration
-            vs_common=r"%VS120COMNTOOLS%",
+            vs_common=r"""%VS120COMNTOOLS%""",
             config='Release',
----------------
Maybe usage of ' vs. " would make it more readable?


================
Comment at: zorg/buildbot/builders/LLDBBuilder.py:139
@@ -130,1 +138,3 @@
+                          warnOnFailure=ignoreInstallFail,
+                          flunkOnFailure=ignoreInstallFail,
                           description='ninja install',
----------------
Setting all 3 mutually exclusive flags (haltOnFailure, warnOnFailure, and flunkOnFailure) to the same value doesn't look right.

You want only one of these be true, right?

http://reviews.llvm.org/D7149

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






More information about the llvm-commits mailing list