1 files changed, 10 insertions, 5 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py
index f6e4ee7..a0ab8c0 100755
--- a/native_client_sdk/src/build_tools/buildbot_run.py
+++ b/native_client_sdk/src/build_tools/buildbot_run.py
@@ -71,20 +71,20 @@ def StepBuildSDK():
       subprocess.check_call(['subst', '/D', subst_drive])
 
 
-def StepTestSDK():
+def StepTestSDK(args):
   cmd = []
   if getos.GetPlatform() == 'linux':
     # Run all of test_sdk.py under xvfb-run; it's startup time leaves something
     # to be desired, so only start it up once.
     # We also need to make sure that there are at least 24 bits per pixel.
     # https://code.google.com/p/chromium/issues/detail?id=316687
-    cmd.extend([
+    cmd += [
         'xvfb-run',
         '--auto-servernum',
         '--server-args', '-screen 0 1024x768x24'
-    ])
+    ]
 
-  cmd.extend([sys.executable, 'test_sdk.py'])
+  cmd += [sys.executable, 'test_sdk.py'] + args
   Run(cmd, cwd=SCRIPT_DIR)
 
 
@@ -115,7 +115,12 @@ def main(args):
   StepRunUnittests()
   StepBuildSDK()
   if not options.build_only:
-    StepTestSDK()
+    # Run sanitizer tests on the asan bot, and on the trybots
+    args = []
+    if getos.GetPlatform() == 'linux':
+      if 'asan' in os.getenv('BUILDBOT_BUILDERNAME', ''):
+        args = ['--sanitizer']
+    StepTestSDK(args)
 
   return 0