Changeset 69685 in webkit


Ignore:
Timestamp:
Oct 13, 2010 12:54:11 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-10-13 Adam Barth <​abarth@webkit.org>

Reviewed by Csaba Osztrogonác.

webkit-patch build shouldn't need --build to actually build!
​https://bugs.webkit.org/show_bug.cgi?id=47438

Yeah, requiring --build for the build command is really dumb. We did
this originally because the build step is usually optional in other
commands. We don't have a good way of reversing the default for an
option in one command. This approach is slightly hacky since --build
still shows up as an option on the help page, but at least it makes
progress. Passing --build is harmless, so the EWS bots shouldn't
explode because of this change.

  • Scripts/webkitpy/tool/bot/commitqueuetask.py:
  • Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
  • Scripts/webkitpy/tool/commands/download.py:
  • Scripts/webkitpy/tool/commands/earlywarningsystem.py:
  • Scripts/webkitpy/tool/commands/queues_unittest.py:
Location:
trunk/WebKitTools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r69674 r69685  
     12010-10-13  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        webkit-patch build shouldn't need --build to actually build!
     6        https://bugs.webkit.org/show_bug.cgi?id=47438
     7
     8        Yeah, requiring --build for the build command is really dumb.  We did
     9        this originally because the build step is usually optional in other
     10        commands.  We don't have a good way of reversing the default for an
     11        option in one command.  This approach is slightly hacky since --build
     12        still shows up as an option on the help page, but at least it makes
     13        progress.  Passing --build is harmless, so the EWS bots shouldn't
     14        explode because of this change.
     15
     16        * Scripts/webkitpy/tool/bot/commitqueuetask.py:
     17        * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
     18        * Scripts/webkitpy/tool/commands/download.py:
     19        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
     20        * Scripts/webkitpy/tool/commands/queues_unittest.py:
     21
    1222010-10-13  Sheriff Bot  <webkit.review.bot@gmail.com>
    223

  • trunk/WebKitTools/Scripts/webkitpy/tool/bot/commitqueuetask.py

    r68484 r69685  
    7777            "--no-clean",
    7878            "--no-update",
    79             "--build",
    8079            "--build-style=both",
    8180            "--quiet",
    … …  
    8988            "--force-clean",
    9089            "--no-update",
    91             "--build",
    9290            "--build-style=both",
    9391            "--quiet",

  • trunk/WebKitTools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

    r68484 r69685  
    6969        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    7070command_passed: success_message='Applied patch' patch='197'
    71 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     71run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    7272command_passed: success_message='Built patch' patch='197'
    7373run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']
    … …  
    9494        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    9595command_passed: success_message='Applied patch' patch='197'
    96 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     96run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    9797command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='197'
    98 run_webkit_patch: ['build', '--force-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     98run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both', '--quiet']
    9999command_passed: success_message='Able to build without patch' patch='197'
    100100"""
    … …  
    109109        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    110110command_passed: success_message='Applied patch' patch='197'
    111 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     111run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    112112command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='197'
    113 run_webkit_patch: ['build', '--force-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     113run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both', '--quiet']
    114114command_failed: failure_message='Unable to build without patch' script_error='MOCK clean build failure' patch='197'
    115115"""
    … …  
    124124        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    125125command_passed: success_message='Applied patch' patch='197'
    126 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     126run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    127127command_passed: success_message='Built patch' patch='197'
    128128run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']
    … …  
    144144        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    145145command_passed: success_message='Applied patch' patch='197'
    146 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     146run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    147147command_passed: success_message='Built patch' patch='197'
    148148run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']
    … …  
    165165        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    166166command_passed: success_message='Applied patch' patch='197'
    167 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     167run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    168168command_passed: success_message='Built patch' patch='197'
    169169run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']
    … …  
    185185        expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    186186command_passed: success_message='Applied patch' patch='197'
    187 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     187run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    188188command_passed: success_message='Built patch' patch='197'
    189189run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py

    r69429 r69685  
    7373    ]
    7474
     75    def _prepare_state(self, options, args, tool):
     76        options.build = True
     77
    7578
    7679class BuildAndTest(AbstractSequencedCommand):

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py

    r66564 r69685  
    4949                "build",
    5050                self.port.flag(),
    51                 "--build",
    5251                "--build-style=%s" % self._build_style,
    5352                "--force-clean",

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py

    r68746 r69685  
    238238            "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    239239MOCK: update_status: commit-queue Applied patch
    240 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     240MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    241241MOCK: update_status: commit-queue Built patch
    242242MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']
    … …  
    261261            "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet', 197]
    262262MOCK: update_status: commit-queue Applied patch
    263 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build', '--build-style=both', '--quiet']
     263MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both', '--quiet']
    264264MOCK: update_status: commit-queue Built patch
    265265MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']
Note: See TracChangeset for help on using the changeset viewer.