[NaCl SDK] Add build-only buildbot configuration.

Buildbots that end in "-build" will now only build the
SDK and not attempt to run any browser-based tests.

Also, don't pass the argv of buildbot_run.py to build_sdk
since chrome's new annotator-based build passes args to
buildbot_run.py which build_sdk doesn't grok.

BUG=302579
R=binji@chromium.org

Review URL: https://codereview.chromium.org/25597003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226534 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 22 insertions, 6 deletions

diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py
index 157cd0b..f41eea18 100644
--- a/native_client_sdk/src/build_tools/buildbot_common.py
+++ b/native_client_sdk/src/build_tools/buildbot_common.py
@@ -24,11 +24,25 @@ def IsSDKBuilder():
   Trybot names:
     (win|mac|linux)_nacl_sdk
 
+  Build-only Trybot names:
+    (win|mac|linux)_nacl_sdk_build
+
   Builder names:
     (windows|mac|linux)-sdk-multi(rel)?"""
   return '-sdk-multi' in os.getenv('BUILDBOT_BUILDERNAME', '')
 
 
+def IsBuildOnlyBot():
+  """Returns True if this script is running on a build-only bot.
+
+  Build only bots are designed to be fast and non-flaky.  Currently
+  this means they don't build chrome, and don't run any browser-based
+  tests.  Currently the only build-only bots are trybots.
+
+  See IsSDKBuilder above for trybot/buildbot names."""
+  return os.getenv('BUILDBOT_BUILDERNAME', '').endswith('build')
+
+
 def IsSDKTrybot():
   """Returns True if this script is running on an SDK trybot.
 
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py
index b58df09..9020780 100755
--- a/native_client_sdk/src/build_tools/buildbot_run.py
+++ b/native_client_sdk/src/build_tools/buildbot_run.py
@@ -35,7 +35,7 @@ def StepRunUnittests():
   Run([sys.executable, 'test_all.py'], env=env, cwd=SDK_SRC_DIR)
 
 
-def StepBuildSDK(args):
+def StepBuildSDK():
   is_win = getos.GetPlatform() == 'win'
 
   # Windows has a path length limit of 255 characters, after joining cwd with a
@@ -51,7 +51,7 @@ def StepBuildSDK(args):
     new_script_dir = SCRIPT_DIR
 
   try:
-    Run([sys.executable, 'build_sdk.py'] + args, cwd=new_script_dir)
+    Run([sys.executable, 'build_sdk.py'], cwd=new_script_dir)
   finally:
     if is_win:
       subprocess.check_call(['subst', '/D', subst_drive])
@@ -68,15 +68,17 @@ def StepTestSDK():
   Run(cmd, cwd=SCRIPT_DIR)
 
 
-def main(args):
+def main():
   StepRunUnittests()
-  StepBuildSDK(args)
-  StepTestSDK()
+  StepBuildSDK()
+  # Skip the testing phase if we are running on a build-only bots.
+  if not buildbot_common.IsBuildOnlyBot():
+    StepTestSDK()
   return 0
 
 
 if __name__ == '__main__':
   try:
-    sys.exit(main(sys.argv[1:]))
+    sys.exit(main())
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('buildbot_run: interrupted')