Upstream version 7.36.149.0

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

diff --git a/src/native_client/buildbot/buildbot_lib.py b/src/native_client/buildbot/buildbot_lib.py
index 950f082..285aa40 100644 (file)
--- a/src/native_client/buildbot/buildbot_lib.py
+++ b/src/native_client/buildbot/buildbot_lib.py
@@ -47,15 +47,19 @@ def SetDefaultContextAttributes(context):
   Set default values for the attributes needed by the SCons function, so that
   SCons can be run without needing ParseStandardCommandLine
   """
   Set default values for the attributes needed by the SCons function, so that
   SCons can be run without needing ParseStandardCommandLine
   """

-  context['platform'] = GetHostPlatform()
+  platform = GetHostPlatform()
+  context['platform'] = platform

   context['mode'] = 'opt'
   context['default_scons_mode'] = ['opt-host', 'nacl']
   context['mode'] = 'opt'
   context['default_scons_mode'] = ['opt-host', 'nacl']

+  context['default_scons_platform'] = ('x86-64' if platform == 'win'
+                                       else 'x86-32')

   context['clang'] = False
   context['asan'] = False
   context['pnacl'] = False
   context['use_glibc'] = False
   context['use_breakpad_tools'] = False
   context['max_jobs'] = 8
   context['clang'] = False
   context['asan'] = False
   context['pnacl'] = False
   context['use_glibc'] = False
   context['use_breakpad_tools'] = False
   context['max_jobs'] = 8

+  context['scons_args'] = []

 
 def ParseStandardCommandLine(context):
   """
 
 def ParseStandardCommandLine(context):
   """


@@ -82,6 +86,8 @@ def ParseStandardCommandLine(context):
                     help='Only run validator regression test')
   parser.add_option('--asan', dest='asan', default=False,
                     action='store_true', help='Build trusted code with ASan.')
                     help='Only run validator regression test')
   parser.add_option('--asan', dest='asan', default=False,
                     action='store_true', help='Build trusted code with ASan.')

+  parser.add_option('--scons-args', dest='scons_args', default =[],
+                    action='append', help='Extra scons arguments.')

   parser.add_option('--step-suffix', metavar='SUFFIX', default='',
                     help='Append SUFFIX to buildbot step names.')
   parser.add_option('--no-gyp', dest='no_gyp', default=False,
   parser.add_option('--step-suffix', metavar='SUFFIX', default='',
                     help='Append SUFFIX to buildbot step names.')
   parser.add_option('--no-gyp', dest='no_gyp', default=False,


@@ -142,6 +148,7 @@ def ParseStandardCommandLine(context):
   context['no_gyp'] = options.no_gyp
   context['coverage'] = options.coverage
   context['use_breakpad_tools'] = options.use_breakpad_tools
   context['no_gyp'] = options.no_gyp
   context['coverage'] = options.coverage
   context['use_breakpad_tools'] = options.use_breakpad_tools

+  context['scons_args'] = options.scons_args

   # Don't run gyp on coverage builds.
   if context['coverage']:
     context['no_gyp'] = True
   # Don't run gyp on coverage builds.
   if context['coverage']:
     context['no_gyp'] = True


@@ -338,6 +345,7 @@ def SCons(context, mode=None, platform=None, parallel=False, browser_test=False,
       '--mode='+','.join(mode),
       'platform='+platform,
       ])
       '--mode='+','.join(mode),
       'platform='+platform,
       ])

+  cmd.extend(context['scons_args'])

   if context['clang']: cmd.append('--clang')
   if context['asan']: cmd.append('--asan')
   if context['use_glibc']: cmd.append('--nacl_glibc')
   if context['clang']: cmd.append('--clang')
   if context['asan']: cmd.append('--asan')
   if context['use_glibc']: cmd.append('--nacl_glibc')