Skip to content

Commit

Permalink
Revert of Flip Linux x64, linux_chromium_archive_rel_ng bots to GN (p…
Browse files Browse the repository at this point in the history
…atchset chromium#2 id:20001 of https://codereview.chromium.org/1435513003/ )

Reason for revert:
libblimp_client.so fails to build under gn.

Issue 553999 filed and tracking.

Original issue's description:
> Flip Linux x64, linux_chromium_archive_rel_ng bots to GN
>
> This patch adds MB support for the new 'linux_chromium_archive_rel_ng'
> bot and flips it and the 'Linux x64' waterfall bot to GN.
>
> This bot should replace the 'linux_chromium_clobber_rel_ng' bot ASAP
> since that bot is doing a GYP build of 'chromium_builder_tests',
> which isn't that interesting, and the supposed builder that that bot
> is mirroring, 'Linux Builder (clobber)' on the chromium.fyi waterfall,
> doesn't actually exist.
>
> TBR=phajdan.jr@chromium.org, jam@chromium.org
> BUG=545480, 531296
>
> Committed: https://crrev.com/d57baf27aee323ba55d7efbd4e447da4aa393d16
> Cr-Commit-Position: refs/heads/master@{#358743}

TBR=phajdan.jr@chromium.org,jam@chromium.org,dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=545480, 531296

Review URL: https://codereview.chromium.org/1416933004

Cr-Commit-Position: refs/heads/master@{#358828}
  • Loading branch information
petermayo authored and Commit bot committed Nov 10, 2015
1 parent 7251b0e commit af229b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
3 changes: 0 additions & 3 deletions testing/buildbot/chromium.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"Linux x64": {
"additional_compile_targets": [
"all"
],
"scripts": [
{
"name": "sizes",
Expand Down
7 changes: 3 additions & 4 deletions tools/mb/mb_config.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
# This is just for completeness; any bot that uses this config should never actually run MB.
'none': ['none'],

'noswarming_gn_release_bot_linux_dump_symbols': ['noswarming', 'gn', 'release_bot', 'linux_dump_symbols'],
'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'],
'noswarming_gyp_release_bot_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'linux_dump_symbols'],
'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
'noswarming_gyp_release_bot_x86_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'x86', 'linux_dump_symbols'],

Expand Down Expand Up @@ -244,7 +244,7 @@
'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },

'linux_dump_symbols': {
'gn_args': '', # TODO(GYP): Port linux_dump_symbols?
'gn_args': 'error', # TODO(GYP): Port linux_dump_symbols?
'gyp_defines': 'linux_dump_symbols=1',
},

Expand Down Expand Up @@ -353,7 +353,7 @@
'chromium': {
'Win': 'noswarming_gyp_release_bot',
'Mac': 'noswarming_gyp_release_bot_mac_strip',
'Linux x64': 'noswarming_gn_release_bot_linux_dump_symbols',
'Linux x64': 'noswarming_gyp_release_bot_linux_dump_symbols',
'Linux': 'noswarming_gyp_release_bot_x86_linux_dump_symbols',
'Android': 'android_gyp_release_bot_minimal_symbols',
},
Expand Down Expand Up @@ -492,7 +492,6 @@
'linux_arm_tester': 'none',
'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot_linux_dump_symbols',
'linux_chromium_clobber_rel_ng': 'gyp_release_trybot',
'linux_chromium_gn_upload': 'gn_linux_upload',
'cast_shell_linux': 'cast_gyp_release_trybot',
Expand Down

0 comments on commit af229b2

Please sign in to comment.