Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / native_client / buildbot / buildbot_pnacl_toolchain.py

diff --git a/src/native_client/buildbot/buildbot_pnacl_toolchain.py b/src/native_client/buildbot/buildbot_pnacl_toolchain.py
index f217d32..f019b78 100755 (executable)
--- a/src/native_client/buildbot/buildbot_pnacl_toolchain.py
+++ b/src/native_client/buildbot/buildbot_pnacl_toolchain.py
@@ -34,39 +34,12 @@ host_os = buildbot_lib.GetHostPlatform()
 context = buildbot_lib.BuildContext()
 status = buildbot_lib.BuildStatus(context)
 
-with buildbot_lib.Step('Update cygwin/check bash', status, halt_on_fail=True):
-  # Update cygwin if necessary.
-  if host_os == 'win':
-    if sys.platform == 'cygwin':
-      print 'This script does not support running from inside cygwin!'
-      sys.exit(1)
-    subprocess.check_call(os.path.join(SCRIPT_DIR, 'cygwin_env.bat'))
-    print os.environ['PATH']
-    paths = os.environ['PATH'].split(os.pathsep)
-    # Put path to cygwin tools at the beginning, so cygwin tools like python
-    # and cmake will supercede others (which do not understand cygwin paths)
-    paths = [os.path.join(NACL_DIR, 'cygwin', 'bin')] + paths
-    print paths
-    os.environ['PATH'] = os.pathsep.join(paths)
-    print os.environ['PATH']
-    bash = os.path.join(NACL_DIR, 'cygwin', 'bin', 'bash')
-  else:
-    # Assume bash is in the path
-    bash = 'bash'
-
-  try:
-    print 'Bash version:'
-    sys.stdout.flush()
-    subprocess.check_call([bash , '--version'])
-  except subprocess.CalledProcessError:
-    print 'Bash not found in path!'
-    raise buildbot_lib.StepFailed()
 
 toolchain_build_cmd = [
     sys.executable,
     os.path.join(
         NACL_DIR, 'toolchain_build', 'toolchain_build_pnacl.py'),
-    '--verbose', '--sync', '--clobber']
+    '--verbose', '--sync', '--clobber', '--build-64bit-host']
 
 # Sync the git repos used by build.sh
 with buildbot_lib.Step('Sync build.sh repos', status, halt_on_fail=True):
@@ -85,14 +58,46 @@ try:
   cmd = toolchain_build_cmd + gsd_arg
   logging.info('Running: ' + ' '.join(cmd))
   subprocess.check_call(cmd)
+
+  with buildbot_lib.Step('LLVM Regression (toolchain_build)', status):
+    llvm_test = [sys.executable,
+                 os.path.join(NACL_DIR, 'pnacl', 'scripts', 'llvm-test.py'),
+                 '--llvm-regression',
+                 '--verbose']
+    buildbot_lib.Command(context, llvm_test)
+
 except subprocess.CalledProcessError:
   # Ignore any failures and keep going (but make the bot stage red).
+  print '@@@STEP_FAILURE@@@'
+sys.stdout.flush()
+
+with buildbot_lib.Step('Update cygwin/check bash', status, halt_on_fail=True):
+  # Update cygwin if necessary.
   if host_os == 'win':
-    print '@@@STEP_WARNINGS@@@'
+    if sys.platform == 'cygwin':
+      print 'This script does not support running from inside cygwin!'
+      sys.exit(1)
+    subprocess.check_call(os.path.join(SCRIPT_DIR, 'cygwin_env.bat'))
+    print os.environ['PATH']
+    paths = os.environ['PATH'].split(os.pathsep)
+    # Put path to cygwin tools at the beginning, so cygwin tools like python
+    # and cmake will supercede others (which do not understand cygwin paths)
+    paths = [os.path.join(NACL_DIR, 'cygwin', 'bin')] + paths
+    print paths
+    os.environ['PATH'] = os.pathsep.join(paths)
+    print os.environ['PATH']
+    bash = os.path.join(NACL_DIR, 'cygwin', 'bin', 'bash')
   else:
-    print '@@@STEP_FAILURE@@@'
-  sys.stdout.flush()
+    # Assume bash is in the path
+    bash = 'bash'
 
+  try:
+    print 'Bash version:'
+    sys.stdout.flush()
+    subprocess.check_call([bash , '--version'])
+  except subprocess.CalledProcessError:
+    print 'Bash not found in path!'
+    raise buildbot_lib.StepFailed()
 
 # Now we run the PNaCl buildbot script. It in turn runs the PNaCl build.sh
 # script and runs scons tests.