[NaCl SDK] Run unittests first buildbots.

Previously the unittests we only run after building the
entire SDK.  Better to run them first (they are fast)
and fail early if they are failing.

BUG=None
TEST=trybots

Review URL: https://chromiumcodereview.appspot.com/11973016

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

2 files changed, 11 insertions, 9 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 7ed8506..94b632e 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -782,7 +782,13 @@ def BuildStepTarBundle(pepper_ver, tarfile):
        'pepper_' + pepper_ver], cwd=NACL_DIR)
 
 
-def BuildStepRunTests():
+def BuildStepRunUnittests():
+  buildbot_common.BuildStep('Run unittests')
+  test_all_py = os.path.join(SDK_SRC_DIR, 'build_tools', 'tests', 'test_all.py')
+  buildbot_common.Run([sys.executable, test_all_py])
+
+
+def BuildStepTestSDK():
   args = []
   if options.build_experimental:
     args.append('--experimental')
@@ -913,6 +919,9 @@ def main(args):
     # of the build.
     del os.environ['NACL_SDK_ROOT']
 
+  if options.run_tests:
+    BuildStepRunUnittests()
+
   BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
   BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
 
@@ -934,7 +943,7 @@ def main(args):
     BuildStepTarBundle(pepper_ver, tarfile)
 
   if options.run_tests:
-    BuildStepRunTests()
+    BuildStepTestSDK()
 
   # Archive on non-trybots.
   if options.archive:
diff --git a/native_client_sdk/src/build_tools/test_sdk.py b/native_client_sdk/src/build_tools/test_sdk.py
index 91a72b1..485358c 100755
--- a/native_client_sdk/src/build_tools/test_sdk.py
+++ b/native_client_sdk/src/build_tools/test_sdk.py
@@ -36,12 +36,6 @@ TEST_LIBRARY_LIST = [
 ]
 
 
-def BuildStepBuildToolsTests():
-  buildbot_common.BuildStep('Run build_tools tests')
-  test_all_py = os.path.join(SDK_SRC_DIR, 'build_tools', 'tests', 'test_all.py')
-  buildbot_common.Run([sys.executable, test_all_py])
-
-
 def BuildStepBuildExamples(pepperdir, platform):
   build_sdk.BuildStepMakeAll(pepperdir, platform, 'examples', 'Build Examples')
 
@@ -118,7 +112,6 @@ def main(args):
   pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver)
   toolchains = ['newlib', 'glibc', 'pnacl', 'host']
 
-  BuildStepBuildToolsTests()
   BuildStepBuildExamples(pepperdir, platform)
   BuildStepCopyTests(pepperdir, toolchains, options.experimental, True)
   BuildStepBuildTests(pepperdir, platform)