Upstream version 5.34.104.0

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

diff --git a/src/native_client/buildbot/buildbot_selector.py b/src/native_client/buildbot/buildbot_selector.py
index ae07f10..ead5107 100755 (executable)
--- a/src/native_client/buildbot/buildbot_selector.py
+++ b/src/native_client/buildbot/buildbot_selector.py
@@ -160,6 +160,10 @@ BOT_ASSIGNMENT = {
     'precise64-toolchain_arm':
         python + ' buildbot/buildbot_toolchain_build.py --buildbot',
 
+    # BIONIC toolchain builders.
+    'precise64-toolchain_bionic':
+        python + ' buildbot/buildbot_toolchain_build_bionic.py --buildbot',
+
     # Pnacl toolchain builders.
     'linux-armtools-x86_32':
         bash + ' buildbot/buildbot_toolchain_arm_trusted.sh',
@@ -298,6 +302,11 @@ def Main():
 
   env = os.environ.copy()
 
+  # Don't write out .pyc files because in cases in which files move around or
+  # the PYTHONPATH / sys.path change, old .pyc files can be mistakenly used.
+  # This avoids the need for admin changes on the bots in this case.
+  env['PYTHONDONTWRITEBYTECODE'] = '1'
+
   # Use .boto file from home-dir instead of buildbot supplied one.
   if 'AWS_CREDENTIAL_FILE' in env:
     del env['AWS_CREDENTIAL_FILE']
@@ -306,6 +315,19 @@ def Main():
 
   env['GSUTIL'] = '/b/build/third_party/gsutil/gsutil'
 
+  if sys.platform == 'win32':
+    # If the temp directory is not on the same drive as the working directory,
+    # there can be random failures when cleaning up temp directories, so use
+    # a directory on the current drive. Use __file__ here instead of os.getcwd()
+    # because toolchain_main picks its working directories relative to __file__
+    filedrive, _ = os.path.splitdrive(__file__)
+    tempdrive, _ = os.path.splitdrive(env['TEMP'])
+    if tempdrive != filedrive:
+      env['TEMP'] = filedrive + '\\temp'
+      env['TMP'] = env['TEMP']
+      if not os.path.exists(env['TEMP']):
+        os.mkdir(env['TEMP'])
+
   # Run through runtest.py to get upload of perf data.
   build_properties = {
       'buildername': builder,