[NaCl SDK] Get nacl_mounts_tests building.

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.
@@ skipping 518 matching lines @@
   stdout, _ = process.communicate()
 
   # Parse environment from "set" command above.
   # It looks like this:
   # KEY1=VALUE1\r\n
   # KEY2=VALUE2\r\n
   # ...
   return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
 
 
-def BuildStepBuildLibraries(pepperdir, platform, directory):
-  buildbot_common.BuildStep('Build Libraries')
-  src_dir = os.path.join(pepperdir, directory)
-  makefile = os.path.join(src_dir, 'Makefile')
+def BuildStepMakeAll(pepperdir, platform, directory, step_name, clean=False):
+  buildbot_common.BuildStep(step_name)
+  make_dir = os.path.join(pepperdir, directory)
+  makefile = os.path.join(make_dir, 'Makefile')
   if os.path.isfile(makefile):
-    print "\n\nMake: " + src_dir
+    print "\n\nMake: " + make_dir
     if platform == 'win':
       # We need to modify the environment to build host on Windows.
       env = GetWindowsEnvironment()
     else:
       env = os.environ
 
     buildbot_common.Run(['make', '-j8'],
-                        cwd=os.path.abspath(src_dir), shell=True, env=env)
-    # Clean to remove temporary files but keep the built libraries.
-    buildbot_common.Run(['make', '-j8', 'clean'],
-                        cwd=os.path.abspath(src_dir), shell=True)
+                        cwd=os.path.abspath(make_dir), shell=True, env=env)
+    if clean:
+      # Clean to remove temporary files but keep the built libraries.
+      buildbot_common.Run(['make', '-j8', 'clean'],
+                          cwd=os.path.abspath(make_dir), shell=True)
+
+
+def BuildStepBuildLibraries(pepperdir, platform, directory):
+  BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries',
+      clean=True)
 
 
 def BuildStepTarBundle(pepper_ver, tarfile):
   buildbot_common.BuildStep('Tar Pepper Bundle')
   buildbot_common.MakeDir(os.path.dirname(tarfile))
   buildbot_common.Run([sys.executable, CYGTAR, '-C', OUT_DIR, '-cjf', tarfile,
        'pepper_' + pepper_ver], cwd=NACL_DIR)
 
 
 def GetManifestBundle(pepper_ver, revision, tarfile, archive_url):
@@ skipping 47 matching lines @@
     # Return the new pepper directory as the one inside the downloaded SDK.
     return os.path.join(OUT_DIR, 'nacl_sdk', 'pepper_' + pepper_ver)
 
   # kill server
   finally:
     if server:
       server.Shutdown()
 
 
 def BuildStepBuildExamples(pepperdir, platform):
-  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
-    if platform == 'win':
-      # We need to modify the environment to build host on Windows.
-      env = GetWindowsEnvironment()
-    else:
-      env = os.environ
+  BuildStepMakeAll(pepperdir, platform, 'examples', 'Build Examples')
 
-    buildbot_common.Run(['make', '-j8'],
-                        cwd=os.path.abspath(example_dir), shell=True, env=env)
 
 TEST_EXAMPLE_LIST = [
+  'nacl_mounts_test',
 ]
 
 TEST_LIBRARY_LIST = [
   'gtest',
 ]
 
 def BuildStepCopyTests(pepperdir, toolchains, build_experimental):
   buildbot_common.BuildStep('Copy Tests')
 
   testingdir = os.path.join(pepperdir, 'testing')
   buildbot_common.RemoveDir(testingdir)
   buildbot_common.MakeDir(testingdir)
 
   args = ['--dstroot=%s' % pepperdir, '--master']
   for toolchain in toolchains:
     args.append('--' + toolchain)
 
-  for example in TEST_EXAMPLE_LIST:
-    dsc = os.path.join(SDK_EXAMPLE_DIR, example, 'example.dsc')
-    args.append(dsc)
-
   for library in TEST_LIBRARY_LIST:
     dsc = os.path.join(SDK_LIBRARY_DIR, library, 'library.dsc')
     args.append(dsc)
 
+  for example in TEST_EXAMPLE_LIST:
+    dsc = os.path.join(SDK_LIBRARY_DIR, example, 'example.dsc')
+    args.append(dsc)
+
   if build_experimental:
     args.append('--experimental')
 
   if generate_make.main(args):
     buildbot_common.ErrorExit('Failed to build tests.')
 
 
-def BuildStepTestExamples(pepperdir, platform, pepper_ver):
+def BuildStepBuildTests(pepperdir, platform):
+  BuildStepMakeAll(pepperdir, platform, 'testing', 'Build Tests')
+
+
+def BuildStepRunPyautoTests(pepperdir, platform, pepper_ver):
   buildbot_common.BuildStep('Test Examples')
   env = copy.copy(os.environ)
   env['PEPPER_VER'] = pepper_ver
   env['NACL_SDK_ROOT'] = pepperdir
 
   pyauto_script = os.path.join(SRC_DIR, 'chrome', 'test', 'functional',
       'nacl_sdk.py')
   pyauto_script_args = ['nacl_sdk.NaClSDKTest.NaClSDKExamples']
 
   if platform == 'linux' and buildbot_common.IsSDKBuilder():
@@ skipping 107 matching lines @@
 
   if options.release:
     pepper_ver = options.release
   print 'Building PEPPER %s at %s' % (pepper_ver, clnumber)
 
   if options.only_examples:
     BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental)
     BuildStepBuildLibraries(pepperdir, platform, 'src')
     BuildStepBuildExamples(pepperdir, platform)
     BuildStepCopyTests(pepperdir, toolchains, options.build_experimental)
-    BuildStepBuildLibraries(pepperdir, platform, 'testing')
+    BuildStepBuildTests(pepperdir, platform)
     if options.test_examples:
-      BuildStepTestExamples(pepperdir, platform, pepper_ver)
+      BuildStepRunPyautoTests(pepperdir, platform, pepper_ver)
   elif options.only_updater:
     build_updater.BuildUpdater(OUT_DIR)
   else:  # Build everything.
     BuildStepBuildToolsTests()
 
     BuildStepDownloadToolchains(platform)
     BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
     BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
     BuildStepCopyTextFiles(pepperdir, pepper_ver, clnumber)
     BuildStepUntarToolchains(pepperdir, platform, arch, toolchains)
     BuildStepBuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains)
     InstallHeaders(os.path.join(pepperdir, 'include'), None, 'libs')
     BuildStepCopyBuildHelpers(pepperdir, platform)
     BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental)
 
     # Ship with libraries prebuilt, so run that first.
     BuildStepBuildLibraries(pepperdir, platform, 'src')
 
     if not options.skip_tar:
       BuildStepTarBundle(pepper_ver, tarfile)
       build_updater.BuildUpdater(OUT_DIR)
 
       # BuildStepTestUpdater downloads the bundle to its own directory. Build
       # the examples and test from this directory instead of the original.
       pepperdir = BuildStepTestUpdater(platform, pepper_ver, clnumber, tarfile)
       BuildStepBuildExamples(pepperdir, platform)
       BuildStepCopyTests(pepperdir, toolchains, options.build_experimental)
-      BuildStepBuildLibraries(pepperdir, platform, 'testing')
+      BuildStepBuildTests(pepperdir, platform)
       if options.test_examples:
-        BuildStepTestExamples(pepperdir, platform, pepper_ver)
+        BuildStepRunPyautoTests(pepperdir, platform, pepper_ver)
 
       # Archive on non-trybots.
       if options.archive or buildbot_common.IsSDKBuilder():
         BuildStepArchiveBundle(pepper_ver, clnumber, tarfile)
         BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))