[zorg] r284038 - Update sanitizer-windows builder to VS2015

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Oct 12 15:02:28 2016
New Revision: 284038

URL: http://llvm.org/viewvc/llvm-project?rev=284038&view=rev
Log:
Update sanitizer-windows builder to VS2015

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=284038&r1=284037&r2=284038&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Oct 12 15:02:28 2016
@@ -734,7 +734,8 @@ def _get_sanitizer_builders():
           {'name': "sanitizer-windows",
            'slavenames' :["sanitizer-windows"],
            'builddir': "sanitizer-windows",
-           'factory': SanitizerBuilderWindows.getSanitizerWindowsBuildFactory()},
+           'factory': SanitizerBuilderWindows.getSanitizerWindowsBuildFactory(
+                        vs='%VS140COMNTOOLS%')},
 
           ## Cortex-A15 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-armv7-a15-full",

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=284038&r1=284037&r2=284038&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Wed Oct 12 15:02:28 2016
@@ -153,9 +153,8 @@ def get_build_slaves():
 
         # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 4GB RAM
         create_slave("zturner-win2008", properties={'jobs': 4}, max_builds=1),
-        # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 8GB RAM
-        create_slave("sanitizer-windows", properties={'jobs': 4}, max_builds=1),
-        # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 8GB RAM
+        # Windows Server 2012 x86_64 16-core GCE instance
+        create_slave("sanitizer-windows", properties={'jobs': 16}, max_builds=1),
         create_slave("windows-gcebot1", properties={'jobs': 8}, max_builds=1),
         # Windows Server 2012 x86_64 32-core GCE instance
         create_slave("windows-gcebot2", properties={'jobs': 32}, max_builds=1),