[zorg] r229847 - [sanitizer-windows bot] Enable tests now that the build is green

[Timur Iskhodzhanov]

Hi Galina,

Luckily, the build turned green without any babysitting, so please
reconfigure (restart?) the master to enable tests now.
I've manually run tests on the bot and they all pass.

Thanks,
Timur

On Thu Feb 19 2015 at 3:40:47 PM Timur Iskhodzhanov <timurrrr at google.com>
wrote:

> Author: timurrrr
> Date: Thu Feb 19 06:36:23 2015
> New Revision: 229847
>
> URL: http://llvm.org/viewvc/llvm-project?rev=229847&view=rev
> Log:
> [sanitizer-windows bot] Enable tests now that the build is green
>
> 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=229847&r1=229846&r2=
> 229847&view=diff
> ============================================================
> ==================
> --- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
> (original)
> +++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Thu Feb
> 19 06:36:23 2015
> @@ -36,8 +36,7 @@ def getSanitizerWindowsBuildFactory(
>              config='Release',
>              target_arch='x86',
>
> -            extra_cmake_args=[],
> -            test=False):
> +            extra_cmake_args=[]):
>
>      ############# PREPARING
>      f = buildbot.process.factory.BuildFactory()
> @@ -67,7 +66,8 @@ def getSanitizerWindowsBuildFactory(
>                                      "-DLLVM_ENABLE_ASSERTIONS=ON"]
>                                     + extra_cmake_args,
>                             haltOnFailure=True,
> -                           workdir=build_dir))
> +                           workdir=build_dir,
> +                           env=Property('slave_env')))
>
>      # Build compiler-rt first to speed up detection of Windows-specific
>      # compiler-time errors in the sanitizers runtime.
> @@ -78,20 +78,14 @@ def getSanitizerWindowsBuildFactory(
>                             workdir=build_dir,
>                             env=Property('slave_env')))
>
> -    f.addStep(NinjaCommand(name='build',
> -                           haltOnFailure=True,
> -                           description='ninja build',
> -                           workdir=build_dir,
> -                           env=Property('slave_env')))
> -
> +    # Only run sanitizer tests.
> +    # Don't build targets that are not required in order to speed up the
> cycle.
>      test_targets = ['check-asan','check-asan-dynamic','check-sanitizer']
> -    ignoreTestFail = bool(test != 'ignoreFail')
>      f.addStep(NinjaCommand(name='run tests',
>                             targets=test_targets,
> -                           flunkOnFailure=ignoreTestFail,
> +                           haltOnFailure=True,
>                             description='ninja test',
>                             workdir=build_dir,
> -                           doStepIf=bool(test),
>                             env=Property('slave_env')))
>
>      return f
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150219/6b9f6675/attachment.html>