[NaCl SDK] Fix build_sdk to prepare for turning on pyauto example testing.

native_client_sdk/src/build_tools/build_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.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
 
 The script inspects the following environment variables:
 
 BUILDBOT_BUILDERNAME to determine whether the script is run locally
 and whether it should upload an SDK to file storage (GSTORE)
 """
 
 
 # std python includes
+import copy
 import optparse
 import os
 import platform
 import subprocess
 import sys
 
 # local includes
 import buildbot_common
 import build_updater
 import build_utils
@@ skipping 413 matching lines @@
       out_makefile, examples)
 
 def main(args):
   parser = optparse.OptionParser()
   parser.add_option('--pnacl', help='Enable pnacl build.',
       action='store_true', dest='pnacl', default=False)
   parser.add_option('--examples', help='Only build the examples.',
       action='store_true', dest='only_examples', default=False)
   parser.add_option('--update', help='Only build the updater.',
       action='store_true', dest='only_updater', default=False)
+  parser.add_option('--test-examples',
+      help='Run the pyauto tests for examples.', action='store_true',
+      dest='test_examples', default=False)
   parser.add_option('--skip-tar', help='Skip generating a tarball.',
       action='store_true', dest='skip_tar', default=False)
   parser.add_option('--archive', help='Force the archive step.',
       action='store_true', dest='archive', default=False)
   parser.add_option('--release', help='PPAPI release version.',
       dest='release', default=None)
 
   options, args = parser.parse_args(args[1:])
   platform = getos.GetPlatform()
   arch = 'x86'
 
   builder_name = os.getenv('BUILDBOT_BUILDERNAME','')
   if builder_name.find('pnacl') >= 0 and builder_name.find('sdk') >= 0:
     options.pnacl = True
 
+  # TODO(binji) for now, only test examples on non-trybots. Trybots don't build
+  # pyauto Chrome.
+  if buildbot_common.IsSDKBuilder():
+    options.test_examples = True
+
   if options.pnacl:
     toolchains = ['pnacl']
   else:
     toolchains = ['newlib', 'glibc']
   print 'Building: ' + ' '.join(toolchains)
   skip = options.only_examples or options.only_updater
 
   skip_examples = skip and not options.only_examples
   skip_update = skip and not options.only_updater
   skip_untar = skip
   skip_build = skip
   skip_test_updater = skip
+  skip_test_examples = skip or not options.test_examples
+  skip_test_build_tools = skip
   skip_tar = skip or options.skip_tar
 
   if options.archive and (options.only_examples or options.skip_tar):
     parser.error('Incompatible arguments with archive.')
 
   pepper_ver = str(int(build_utils.ChromeMajorVersion()))
   pepper_old = str(int(build_utils.ChromeMajorVersion()) - 1)
   clnumber = build_utils.ChromeRevision()
   if options.release:
     pepper_ver = options.release
@@ skipping 54 matching lines @@
   if 'pnacl' in toolchains:
     tarname = 'p' + tarname
   tarfile = os.path.join(OUT_DIR, tarname)
 
   if not skip_tar:
     buildbot_common.BuildStep('Tar Pepper Bundle')
     buildbot_common.Run([sys.executable, CYGTAR, '-C', OUT_DIR, '-cjf', tarfile,
          'pepper_' + pepper_ver], cwd=NACL_DIR)
 
   # Run build tests
-  buildbot_common.BuildStep('Run build_tools tests')
-  buildbot_common.Run([sys.executable,
-      os.path.join(SDK_SRC_DIR, 'build_tools', 'tests', 'test_all.py')])
+  if not skip_test_build_tools:
+    buildbot_common.BuildStep('Run build_tools tests')
+    buildbot_common.Run([sys.executable,
+        os.path.join(SDK_SRC_DIR, 'build_tools', 'tests', 'test_all.py')])
 
   # build sdk update
   if not skip_update:
     build_updater.BuildUpdater(OUT_DIR)
 
   # start local server sharing a manifest + the new bundle
   if not skip_test_updater and not skip_tar:
     buildbot_common.BuildStep('Move bundle to localserver dir')
     buildbot_common.MakeDir(SERVER_DIR)
     buildbot_common.Move(tarfile, SERVER_DIR)
@@ skipping 40 matching lines @@
       # If we are testing examples, do it in the newly pulled directory.
       pepperdir = os.path.join(OUT_DIR, 'nacl_sdk', 'pepper_' + pepper_ver)
 
     # kill server
     finally:
       if server:
         server.Shutdown()
 
   # build examples.
   if not skip_examples:
-    buildbot_common.BuildStep('Test Build Examples')
+    buildbot_common.BuildStep('Build Examples')
     example_dir = os.path.join(pepperdir, 'examples')
     makefile = os.path.join(example_dir, 'Makefile')
     if os.path.isfile(makefile):
       print "\n\nMake: " + example_dir
       buildbot_common.Run(['make', '-j8'],
                           cwd=os.path.abspath(example_dir), shell=True)
 
   # test examples.
-  skip_test_examples = True
-  if not skip_examples:
-    if not skip_test_examples:
-      run_script_path = os.path.join(SRC_DIR, 'chrome', 'test', 'functional')
-      buildbot_common.Run([sys.executable, 'nacl_sdk_example_test.py',
-        'nacl_sdk_example_test.NaClSDKTest.testNaClSDK'], cwd=run_script_path,
-        env=dict(os.environ.items()+{'pepper_ver':pepper_ver,
-        'OUT_DIR':OUT_DIR}.items()))
+  if not skip_examples and not skip_test_examples:
+    buildbot_common.BuildStep('Test Examples')
+    env = copy.copy(os.environ)
+    env['pepper_ver'] = pepper_ver
+    env['OUT_DIR'] = OUT_DIR
+    run_script_path = os.path.join(SRC_DIR, 'chrome', 'test', 'functional')
+    buildbot_common.Run([sys.executable, 'nacl_sdk.py',
+      'nacl_sdk.NaClSDKTest.NaClSDKExamples'], cwd=run_script_path,
+      env=env)
 
   # Archive on non-trybots.
-  buildername = os.environ.get('BUILDBOT_BUILDERNAME', '')
-  if options.archive or '-sdk' in buildername:
+  if options.archive or buildbot_common.IsSDKBuilder():
     buildbot_common.BuildStep('Archive build')
     bucket_path = 'nativeclient-mirror/nacl/nacl_sdk/%s' % \
         build_utils.ChromeVersion()
     buildbot_common.Archive(tarname, bucket_path, os.path.dirname(tarfile))
 
     if not skip_update:
       # Only push up sdk_tools.tgz on the linux buildbot.
-      if buildername == 'linux-sdk-multi':
+      if builder_name == 'linux-sdk-multi':
         sdk_tools = os.path.join(OUT_DIR, 'sdk_tools.tgz')
         buildbot_common.Archive('sdk_tools.tgz', bucket_path, OUT_DIR,
                                 step_link=False)
 
     # generate "manifest snippet" for this archive.
     if not skip_test_updater:
       archive = bundle.GetArchive(manifest_util.GetHostOS())
       archive.url = 'https://commondatastorage.googleapis.com/' \
           'nativeclient-mirror/nacl/nacl_sdk/%s/%s' % (
               build_utils.ChromeVersion(), tarname)
       manifest_snippet_file = os.path.join(OUT_DIR, tarname + '.json')
       with open(manifest_snippet_file, 'wb') as manifest_snippet_stream:
         manifest_snippet_stream.write(bundle.GetDataAsString())
 
       buildbot_common.Archive(tarname + '.json', bucket_path, OUT_DIR,
                               step_link=False)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))