<div dir="ltr">Hi Galina,<div><br></div><div>Luckily, the build turned green without any babysitting, so please reconfigure (restart?) the master to enable tests now.</div><div>I've manually run tests on the bot and they all pass.</div><div><br></div><div>Thanks,</div><div>Timur<br><br><div class="gmail_quote">On Thu Feb 19 2015 at 3:40:47 PM Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com">timurrrr@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: timurrrr<br>
Date: Thu Feb 19 06:36:23 2015<br>
New Revision: 229847<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229847&view=rev" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-<u></u>project?rev=229847&view=rev</a><br>
Log:<br>
[sanitizer-windows bot] Enable tests now that the build is green<br>
<br>
Modified:<br>
zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py<br>
<br>
Modified: zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=229847&r1=229846&r2=229847&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-<u></u>project/zorg/trunk/zorg/<u></u>buildbot/builders/<u></u>SanitizerBuilderWindows.py?<u></u>rev=229847&r1=229846&r2=<u></u>229847&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py (original)<br>
+++ zorg/trunk/zorg/buildbot/<u></u>builders/<u></u>SanitizerBuilderWindows.py Thu Feb 19 06:36:23 2015<br>
@@ -36,8 +36,7 @@ def getSanitizerWindowsBuildFactor<u></u>y(<br>
config='Release',<br>
target_arch='x86',<br>
<br>
- extra_cmake_args=[],<br>
- test=False):<br>
+ extra_cmake_args=[]):<br>
<br>
############# PREPARING<br>
f = buildbot.process.factory.<u></u>BuildFactory()<br>
@@ -67,7 +66,8 @@ def getSanitizerWindowsBuildFactor<u></u>y(<br>
"-DLLVM_ENABLE_ASSERTIONS=ON"]<br>
+ extra_cmake_args,<br>
haltOnFailure=True,<br>
- workdir=build_dir))<br>
+ workdir=build_dir,<br>
+ env=Property('slave_env')))<br>
<br>
# Build compiler-rt first to speed up detection of Windows-specific<br>
# compiler-time errors in the sanitizers runtime.<br>
@@ -78,20 +78,14 @@ def getSanitizerWindowsBuildFactor<u></u>y(<br>
workdir=build_dir,<br>
env=Property('slave_env')))<br>
<br>
- f.addStep(NinjaCommand(name='<u></u>build',<br>
- haltOnFailure=True,<br>
- description='ninja build',<br>
- workdir=build_dir,<br>
- env=Property('slave_env')))<br>
-<br>
+ # Only run sanitizer tests.<br>
+ # Don't build targets that are not required in order to speed up the cycle.<br>
test_targets = ['check-asan','check-asan-<u></u>dynamic','check-sanitizer']<br>
- ignoreTestFail = bool(test != 'ignoreFail')<br>
f.addStep(NinjaCommand(name='<u></u>run tests',<br>
targets=test_targets,<br>
- flunkOnFailure=ignoreTestFail,<br>
+ haltOnFailure=True,<br>
description='ninja test',<br>
workdir=build_dir,<br>
- doStepIf=bool(test),<br>
env=Property('slave_env')))<br>
<br>
return f<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank" class="cremed">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="cremed">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div>