[zorg] r310301 - Remove steps for building and testing libFuzzer on Windows

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Mon Aug  7 13:31:58 2017
New Revision: 310301

URL: http://llvm.org/viewvc/llvm-project?rev=310301&view=rev
Log:
Remove steps for building and testing libFuzzer on Windows

They are broken and nobody is maintaining them.

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=310301&r1=310300&r2=310301&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Mon Aug  7 13:31:58 2017
@@ -65,8 +65,7 @@ def getSanitizerWindowsBuildFactory(
     f = getSource(f,'llvm')
 
     # Global configurations
-    build_dir='build'
-    build_fuzzer_dir='build-fuzzer'
+    build_dir = 'build'
 
     ############# CLEANING
     cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
@@ -115,61 +114,4 @@ def getSanitizerWindowsBuildFactory(
                              workdir=build_dir,
                              env=Property('slave_env')))
 
-    # Clean fuzzer build dir.
-    f.addStep(RemoveDirectory(name='clean '+build_fuzzer_dir,
-                dir=build_fuzzer_dir,
-                haltOnFailure=False,
-                flunkOnFailure=False,
-                doStepIf=cleanBuildRequested
-                ))
-
-    # Build path.
-    build_path = "%(workdir)s\\" + build_dir
-    # Get binary dir.
-    bin_path = build_path + "\\bin"
-
-    # Get clang version.
-    f.addStep(SetProperty(command=WithProperties(bin_path+"\\clang --version"),
-                          extract_fn=extractClangVersion))
-
-    # Get compiler-rt's libraries dir.
-    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.
-    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')))
-
-    # 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",
-                               "-DCMAKE_C_COMPILER=clang-cl.exe",
-                               "-DCMAKE_CXX_COMPILER=clang-cl.exe",
-                               "-DLLVM_USE_SANITIZER=Address",
-                               "-DLLVM_USE_SANITIZE_COVERAGE=YES"]
-                               + extra_cmake_args,
-                           haltOnFailure=False,
-                           workdir=build_fuzzer_dir,
-                           env=Property('slave_env')))
-
-    # Build libFuzzer.
-    f.addStep(NinjaCommand(name='build LLVMFuzzer',
-                           targets=['LLVMFuzzer'],
-                           haltOnFailure=False,
-                           description='ninja LLVMFuzzer',
-                           workdir=build_fuzzer_dir,
-                           env=Property('slave_env')))
-
-    # Run libFuzzer's tests.
-    f.addStep(NinjaCommand(name='run fuzzer tests',
-                           targets=['check-fuzzer'],
-                           haltOnFailure=False,
-                           description='ninja check-fuzzer',
-                           workdir=build_fuzzer_dir,
-                           env=Property('slave_env')))
-
     return f