[zorg] r297123 - Reverted r297041.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Tue Mar  7 00:51:12 2017
New Revision: 297123

URL: http://llvm.org/viewvc/llvm-project?rev=297123&view=rev
Log:
Reverted r297041.

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

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=297123&r1=297122&r2=297123&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Tue Mar  7 00:51:12 2017
@@ -11,8 +11,6 @@ from buildbot.process.properties import
 from zorg.buildbot.builders.Util import getVisualStudioEnvironment
 from zorg.buildbot.builders.Util import extractSlaveEnvironment
 from zorg.buildbot.builders.Util import extractClangVersion
-from zorg.buildbot.process.properties import InterpolateToNativePath, InterpolateToPosixPath
-from zorg.buildbot.commands.CmakeCommand import CmakeCommand
 from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 def getSource(f,llvmTopDir='llvm'):
@@ -138,21 +136,19 @@ def getSanitizerWindowsBuildFactory(
     dll_path = build_path + "\\lib\\clang\\%(clang_version)s\\lib\\windows"
 
     # Update slave_env to add fresh clang, tools and compiler-rt dlls to path.
-    # A path with the native to a buildslave path separator should be used.
     update_path_cmd = "set Path="+bin_path+";"+dll_path+";%%Path%% && set"
-    f.addStep(SetProperty(command=InterpolateToNativePath(update_path_cmd),
+    f.addStep(SetProperty(command=WithProperties(update_path_cmd),
                           extract_fn=extractSlaveEnvironment,
                           env=Property('slave_env')))
 
-    # Get absolute path to clang-cl.
-    clang_cl = "%(workdir)s/" + build_dir + "/bin/clang-cl"
-    # Note: Cmake expects POSIX-style paths as an input.
+    # clang-cl.exe should already be on the path (because of the previous step)
+    # so we don't need to specify its path, cmake should be able to find it.
     f.addStep(ShellCommand(name='cmake',
                            command=[cmake, "-G", "Ninja", "../llvm",
                                "-DCMAKE_BUILD_TYPE="+config,
                                "-DLLVM_ENABLE_ASSERTIONS=ON",
-                               InterpolateToPosixPath("-DCMAKE_C_COMPILER=" + clang_cl),
-                               InterpolateToPosixPath("-DCMAKE_CXX_COMPILER=" + clang_cl),
+                               "-DCMAKE_C_COMPILER=clang-cl.exe",
+                               "-DCMAKE_CXX_COMPILER=clang-cl.exe",
                                "-DLLVM_USE_SANITIZER=Address",
                                "-DLLVM_USE_SANITIZE_COVERAGE=YES"]
                                + extra_cmake_args,