[buildbot] Use CmakeCommand

[rnk]

lgtm

zorg/buildbot/builders/SanitizerBuilderWindows.py

81–84

IMO this is more Python-y:

cmake_args = []
if extra_configure_args:
    cmake_args = list(extra_configure_args)

I've always felt that using "[:]" to copy a list was confusing.

[mpividori]

zorg/buildbot/builders/SanitizerBuilderWindows.py

81–84

@rnk Ok, I agree.

zorg/buildbot/builders/SanitizerBuilderWindows.py

 import os
 
 import buildbot
 import buildbot.process.factory
 from buildbot.steps.shell import SetProperty
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.slave import RemoveDirectory
 from buildbot.steps.source import SVN
 from buildbot.process.properties import Property
 from buildbot.process.properties import WithProperties
 from zorg.buildbot.builders.Util import getVisualStudioEnvironment
 from zorg.buildbot.builders.Util import extractSlaveEnvironment
 from zorg.buildbot.builders.Util import extractClangVersion
+from zorg.buildbot.commands.CmakeCommand import CmakeCommand
 from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 def getSource(f,llvmTopDir='llvm'):
     f.addStep(SVN(name='svn-llvm',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
                   defaultBranch='trunk',
                   workdir=llvmTopDir))
     f.addStep(SVN(name='svn-clang',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/cfe/',
                   defaultBranch='trunk',
                   workdir='%s/tools/clang' % llvmTopDir))
     f.addStep(SVN(name='svn-lld',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/lld/',
                   defaultBranch='trunk',
                   workdir='%s/tools/lld' % llvmTopDir))
     f.addStep(SVN(name='svn-compiler-rt',
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
                   defaultBranch='trunk',
                   workdir='%s/projects/compiler-rt' % llvmTopDir))
     return f
 
 def getSanitizerWindowsBuildFactory(
             clean=False,
-            cmake='cmake',
 
             # Default values for VS devenv and build configuration
             vs=r"""%VS120COMNTOOLS%""",
             config='Release',
             target_arch='x86',
 
-            extra_cmake_args=[]):
+            extra_configure_args= None):
 
     ############# PREPARING
     f = buildbot.process.factory.BuildFactory()
 
     # Kill any stale symbolizer processes for the last run. If there are any
     # stale processes, the build will fail during linking. This can happen to
     # any process, but it is most likely to happen to llvm-symbolizer if its
     # pipe isn't closed.
def getSanitizerWindowsBuildFactory(
     cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
     f.addStep(RemoveDirectory(name='clean '+build_dir,
                 dir=build_dir,
                 haltOnFailure=False,
                 flunkOnFailure=False,
                 doStepIf=cleanBuildRequested
                 ))
 
-    f.addStep(ShellCommand(name='cmake',
-                           command=[cmake, "-G", "Ninja", "../llvm",
-                                    "-DCMAKE_BUILD_TYPE="+config,
-                                    "-DLLVM_ENABLE_ASSERTIONS=ON"]
-                                   + extra_cmake_args,
+    # Make a local copy of the configure args, as we are going to modify that.
+    if extra_configure_args:
+        cmake_args = extra_configure_args[:]
+    else:
+        cmake_args = list()
+
+    # Set proper defaults.
+    CmakeCommand.applyDefaultOptions(cmake_args, [
+        ('-G',                        'Ninja'),
+        ('-DCMAKE_BUILD_TYPE=',       config),
+        ('-DLLVM_ENABLE_ASSERTIONS=', 'ON')
+        ])
+
+    # Create configuration files with cmake
+    f.addStep(CmakeCommand(name="cmake-configure",
+                           options=cmake_args,
+                           path="../llvm",
                            haltOnFailure=True,
+                           description=["cmake configure"],
                            workdir=build_dir,
-                           env=Property('slave_env')))
+                           env=Property('slave_env'),
+                           doStepIf=FileDoesNotExist(
+                                        "./%s/CMakeCache.txt" % build_dir)))
 
     # Build compiler-rt first to speed up detection of Windows-specific
     # compiler-time errors in the sanitizer runtimes.
     f.addStep(NinjaCommand(name='build compiler-rt',
                            targets=['compiler-rt'],
                            haltOnFailure=True,
                            description='ninja compiler-rt',
                            workdir=build_dir,
def getSanitizerWindowsBuildFactory(
     # Update slave_env to add fresh clang, tools and compiler-rt dlls to path.
     update_path_cmd = "set Path=\""+bin_path+";"+dll_path+";%Path%\" && set"
     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"
-    f.addStep(ShellCommand(name='cmake',
-                           command=[cmake, "-G", "Ninja", "../llvm",
-                               "-DCMAKE_BUILD_TYPE="+config,
-                               "-DLLVM_ENABLE_ASSERTIONS=ON",
-                               WithProperties("-DCMAKE_C_COMPILER="+clang_cl),
-                               WithProperties("-DCMAKE_CXX_COMPILER="+clang_cl),
-                               "-DLLVM_USE_SANITIZER=Address",
-                               "-DLLVM_USE_SANITIZE_COVERAGE=YES"]
-                               + extra_cmake_args,
+
+    # Set proper defaults.
+    CmakeCommand.applyDefaultOptions(cmake_args, [
+        ('-G',                        'Ninja'),
+        ('-DCMAKE_BUILD_TYPE=',       config),
+        ('-DLLVM_ENABLE_ASSERTIONS=', 'ON'),
+        ])
+
+    # Some options are required for this build no matter what.
+    CmakeCommand.applyRequiredOptions(cmake_args, [
+        ('-DCMAKE_C_COMPILER=',           WithProperties(clang_cl)),
+        ('-DCMAKE_CXX_COMPILER=',         WithProperties(clang_cl)),
+        ('-DLLVM_USE_SANITIZER=',         'Address'),
+        ('-DLLVM_USE_SANITIZE_COVERAGE=', 'YES')
+        ])
+
+    # Create configuration files with cmake
+    f.addStep(CmakeCommand(name="cmake-fuzzer-configure",
+                           options=cmake_args,
+                           path="../llvm",
                            haltOnFailure=True,
+                           description=["cmake fuzzer configure"],
                            workdir=build_fuzzer_dir,
-                           env=Property('slave_env')))
+                           env=Property('slave_env'),
+                           doStepIf=FileDoesNotExist(
+                               "./%s/CMakeCache.txt" % build_fuzzer_dir)))
 
     # Build libFuzzer.
     f.addStep(NinjaCommand(name='build LLVMFuzzer',
                            targets=['LLVMFuzzer'],
                            haltOnFailure=True,
                            description='ninja LLVMFuzzer',
                            workdir=build_dir,
                            env=Property('slave_env')))