[NaCl SDK] Add support for ASAN, TSAN and valgrind to test_sdk.py

native_client_sdk/src/build_tools/test_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Script for a testing an existing SDK.
 
 This script is normally run immediately after build_sdk.py.
 """
 
@@ skipping 45 matching lines @@
                                 toolchains=toolchains)
 
 
 def StepBuildTests(pepperdir):
   for config in ('Debug', 'Release'):
     build_sdk.BuildStepMakeAll(pepperdir, 'tests',
                                    'Build Tests (%s)' % config,
                                    deps=False, config=config)
 
 
-def StepRunSelLdrTests(pepperdir):
+def StepRunSelLdrTests(pepperdir, sanitiser):
   filters = {
     'SEL_LDR': True
   }
 
   tree = parse_dsc.LoadProjectTree(SDK_SRC_DIR, include=filters)
 
   def RunTest(test, toolchain, config, arch=None):
-    args = ['run', 'STANDALONE=1', 'TOOLCHAIN=%s' % toolchain]
+    args = ['STANDALONE=1', 'TOOLCHAIN=%s' % toolchain]
     if arch is not None:
       args.append('NACL_ARCH=%s' % arch)
+    deps = False
+
+    if sanitiser is not None:
+      # For sanitizer builds we pass extra argument for make, and do
+      # full clean build to make sure everything is rebuilt with the
+      # correct flags
+      deps = True
+      if sanitiser == 'valgrind':
+        args += ['RUN_UNDER=valgrind']
+      else:
+        args += ['CC=clang', 'CXX=clang++',
+                 'LDFLAGS=-pie -fsanitize=' + sanitiser,
+                 'CFLAGS=-fPIC -fsanitize=' + sanitiser]
+      build_projects.BuildProjectsBranch(pepperdir, 'src', clean=False,
+                                         deps=deps, config=config,
+                                         args=args + ['clean'])
+      build_projects.BuildProjectsBranch(pepperdir, 'tests', clean=False,
+                                         deps=deps, config=config,
+                                         args=args + ['clean'])
+
     build_projects.BuildProjectsBranch(pepperdir, test, clean=False,
-                                       deps=False, config=config,
-                                       args=args)
+                                       deps=deps, config=config,
+                                       args=args + ['run'])
 
   if getos.GetPlatform() == 'win':
     # On win32 we only support running on the system
     # arch
     archs = (getos.GetSystemArch('win'),)
   elif getos.GetPlatform() == 'mac':
     # We only ship 32-bit version of sel_ldr on mac.
     archs = ('x86_32',)
   else:
     # On linux we can run both 32 and 64-bit
     archs = ('x86_64', 'x86_32')
 
   for root, projects in tree.iteritems():
     for project in projects:
-      title = 'sel_ldr tests: %s' % os.path.basename(project['NAME'])
+      if sanitiser:
+        sanitiser_name = '[sanitiser=%s]'  % sanitiser
+      else:
+        sanitiser_name = ''
+      title = 'standalone test%s: %s' % (sanitiser_name,
+                                         os.path.basename(project['NAME']))
       location = os.path.join(root, project['NAME'])
       buildbot_common.BuildStep(title)
+      configs = ('Debug', 'Release')
 
       # On linux we can run the standalone tests natively using the host
       # compiler.
       if getos.GetPlatform() == 'linux':
-        for config in ('Debug', 'Release'):
+        if sanitiser:
+          configs = ('Debug',)
+        for config in configs:
           RunTest(location, 'linux', config)
 
+      if sanitiser:
+        continue
+
       for toolchain in ('newlib', 'glibc'):
         for arch in archs:
-          for config in ('Debug', 'Release'):
+          for config in configs:
             RunTest(location, toolchain, config, arch)
 
 
 def StepRunBrowserTests(toolchains, experimental):
   buildbot_common.BuildStep('Run Tests')
 
   args = [
     sys.executable,
     os.path.join(SCRIPT_DIR, 'test_projects.py'),
     '--retry-times=3',
   ]
 
   if experimental:
     args.append('-x')
   for toolchain in toolchains:
     args.extend(['-t', toolchain])
 
   try:
     subprocess.check_call(args)
   except subprocess.CalledProcessError:
     buildbot_common.ErrorExit('Error running tests.')
 
 
 def main(args):
   usage = '%prog [<options>] [<phase...>]'
   parser = optparse.OptionParser(description=__doc__, usage=usage)
   parser.add_option('--experimental', help='build experimental tests',
                     action='store_true')
+  parser.add_option('--sanitiser',

[binji, 2014/06/04 23:28:10]

include american spelling too? :) (it matches clang flag as well)

[Sam Clegg, 2014/06/04 23:46:16]

Done.

+                    help='Run sanitiser (asan/tsan/valgrind) tests',
+                    action='store_true')
   parser.add_option('--verbose', '-v', help='Verbose output',
                     action='store_true')
 
   if 'NACL_SDK_ROOT' in os.environ:
     # We don't want the currently configured NACL_SDK_ROOT to have any effect
     # of the build.
     del os.environ['NACL_SDK_ROOT']
 
   # To setup bash completion for this command first install optcomplete
   # and then add this line to your .bashrc:
@@ skipping 11 matching lines @@
   toolchains = ['newlib', 'glibc', 'pnacl']
   toolchains.append(getos.GetPlatform())
 
   if options.verbose:
     build_projects.verbose = True
 
   phases = [
     ('build_examples', StepBuildExamples, pepperdir),
     ('copy_tests', StepCopyTests, pepperdir, toolchains, options.experimental),
     ('build_tests', StepBuildTests, pepperdir),
-    ('sel_ldr_tests', StepRunSelLdrTests, pepperdir),
+    ('sel_ldr_tests', StepRunSelLdrTests, pepperdir, False),

[binji, 2014/06/04 23:28:10]

StepRunSelLdrTests checks for None above

[Sam Clegg, 2014/06/04 23:46:16]

Done.

     ('browser_tests', StepRunBrowserTests, toolchains, options.experimental),
   ]
 
+  if options.sanitiser:
+    if getos.GetPlatform() != 'linux':
+      buildbot_common.ErrorExit('sanitiser tests only run on linux.')
+    phases = [
+    ('copy_tests', StepCopyTests, pepperdir, toolchains, options.experimental),

[binji, 2014/06/04 23:28:10]

nit: indent

[Sam Clegg, 2014/06/04 23:46:16]

Done.

+    ('sel_ldr_tests_asan', StepRunSelLdrTests, pepperdir, 'address'),
+    ('sel_ldr_tests_tsan', StepRunSelLdrTests, pepperdir, 'thread'),
+    ('sel_ldr_tests_valgrind', StepRunSelLdrTests, pepperdir, 'valgrind')
+    ]
+
   if args:
     phase_names = [p[0] for p in phases]
     for arg in args:
       if arg not in phase_names:
         msg = 'Invalid argument: %s\n' % arg
         msg += 'Possible arguments:\n'
         for name in phase_names:
           msg += '   %s\n' % name
         parser.error(msg.strip())
 
   for phase in phases:
     phase_name = phase[0]
     if args and phase_name not in args:
       continue
     phase_func = phase[1]
     phase_args = phase[2:]
     phase_func(*phase_args)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('test_sdk: interrupted')