diff options
| author | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 01:14:57 +0000 |
|---|---|---|
| committer | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 01:14:57 +0000 |
| commit | a810f699a654cd361b7509c2412c22ef5d9369a0 (patch) | |
| tree | 3bf59558cfcb1757255aa3f0afe79469755e54cb /native_client_sdk | |
| parent | eeb597a0bd10cc19812c0198b2abb5160cd48e0a (diff) | |
| download | chromium_src-a810f699a654cd361b7509c2412c22ef5d9369a0.zip chromium_src-a810f699a654cd361b7509c2412c22ef5d9369a0.tar.gz chromium_src-a810f699a654cd361b7509c2412c22ef5d9369a0.tar.bz2 | |
Upate SDK builder script to force PNaCl builders to use --pnacl option.
Instead of using the buildbot code to dertermine which builds run pnacl,
we use the builder's name to make that determination in the SDK script.
Update try script to include pnacl builder.
R= bradnelson@chromium.org
BUG= 11292
Review URL: http://codereview.chromium.org/9402029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/buildbot_run.py | 10 | ||||
| -rwxr-xr-x | native_client_sdk/src/sdktry.sh | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py index 860d68f..5ce72f5 100755 --- a/native_client_sdk/src/build_tools/buildbot_run.py +++ b/native_client_sdk/src/build_tools/buildbot_run.py @@ -480,10 +480,14 @@ def main(args): platform = getos.GetPlatform() arch = 'x86' - if not options.pnacl: - toolchains = ['newlib', 'glibc'] - else: + builder_name = os.getenv('BUILDBOT_BUILDERNAME','') + if builder_name.find('pnacl') >= 0 and builder_name.find('pnacl') >= 0: + options.pnacl = True + + if options.pnacl: toolchains = ['pnacl'] + else: + toolchains = ['newlib', 'glibc'] print 'Building: ' + ' '.join(toolchains) skip = options.examples or options.update diff --git a/native_client_sdk/src/sdktry.sh b/native_client_sdk/src/sdktry.sh index 4ebb916..deac1e2 100755 --- a/native_client_sdk/src/sdktry.sh +++ b/native_client_sdk/src/sdktry.sh @@ -1,14 +1,16 @@ #!/bin/bash -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # gcl wrapper to kick off nacl-sdk try jobs. gcl try $* \ - -b naclsdkm-linux \ -b naclsdkm-mac \ + -b naclsdkm-linux \ + -b naclsdkm-linux \ + -b naclsdkm-pnacl-linux \ -b naclsdkm-windows32 \ -b naclsdkm-windows64 \ - -S svn://svn.chromium.org/chrome-try/try-nacl
\ No newline at end of file + -S svn://svn.chromium.org/chrome-try/try-nacl |