Land http://codereview.chromium.org/2998005/show -- Update Memcheck command...

scripts/master/factory/nacl_commands.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Set of utilities to add commands to a buildbot factory.
 
 Contains the Native Client specific commands. Based on commands.py"""
 
 import os
@@ skipping 500 matching lines @@
   def AddUtmanTests(self, platform, options=None, timeout=300):
     """Add a build step to run utman tests."""
     self.AddTestStep(
         shell.ShellCommand,
         test_name='test-' + platform, timeout=timeout,
         test_command='UTMAN_DEBUG=true tools/llvm/utman.sh test-' + platform,
         workdir='build/native_client',
         env=self._build_env,
         locks=[self.slave_exclusive_lock])
 
-  def AddValgrind(self, options=None):
-    """Add a valgrind test step."""
+  def AddMemcheck(self, options=None):
+    """Add a Memcheck test step."""
     cmd = ('%s platform=x86-64 sdl=none '
-           'run_under=src/third_party/valgrind/bin/memcheck.sh,'
-           '--log-file=mc.log scale_timeout=20 '
-           'run_hello_world_test') % self._test_tool
+           'buildbot=memcheck memcheck_bot_tests') % self._test_tool
     self.AddTestStep(
         shell.ShellCommand,
-        test_name='valgrind', timeout=10000,
+        test_name='memcheck', timeout=10000,
+        test_command=cmd,
+        workdir='build/native_client',
+        env=self._build_env,
+        locks=[self.slave_exclusive_lock])
+
+  def AddThreadSanitizer(self, options=None):
+    """Add a ThreadSanitizer test step."""
+    cmd = ('%s platform=x86-64 sdl=none '
+           'buildbot=tsan tsan_bot_tests') % self._test_tool
+    self.AddTestStep(
+        shell.ShellCommand,
+        test_name='tsan', timeout=10000,
         test_command=cmd,
         workdir='build/native_client',
         env=self._build_env,
         locks=[self.slave_exclusive_lock])
 
   def DropDoxygen(self):
     """Adds a step to drop doxygen from the tarballs."""
     if self._target_platform.startswith('win'):
       cmd = ('rmdir /q /s ..\\third_party\\doxygen & '
              'rmdir /q /s ..\\doxygen.DEPS & echo nop')
@@ skipping 102 matching lines @@
                             haltOnFailure=True,
                             workdir='build/native_client/tools/modular-build',
                             command='rm -rf out')
     self._factory.addStep(shell.ShellCommand,
                           description='modular_build',
                           timeout=timeout,
                           haltOnFailure=True,
                           workdir='build/native_client/tools/modular-build',
                           command='python build.py -b')