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

scripts/master/factory/nacl_commands.py

Index: scripts/master/factory/nacl_commands.py
===================================================================
--- scripts/master/factory/nacl_commands.py	(revision 54715)
+++ scripts/master/factory/nacl_commands.py	(working copy)
@@ -518,20 +518,30 @@
         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'):