Log Message
More debug queue build fixing. Preserve the build style in one more place. Changed mock build_style from "both" to "release", as we don't support testing both debug and release.
* Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py: (MockCommitQueue.archive_last_test_results): (MockCommitQueue): (MockCommitQueue.build_style): (MockCommitQueue.did_pass_testing_ews): * Scripts/webkitpy/tool/bot/patchanalysistask.py: (PatchAnalysisTask._test): (PatchAnalysisTask._build_and_test_without_patch): * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py: (EarlyWarningSystemTest._default_expected_logs): * Scripts/webkitpy/tool/commands/queues_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (191035 => 191036)
--- trunk/Tools/ChangeLog 2015-10-14 06:16:36 UTC (rev 191035)
+++ trunk/Tools/ChangeLog 2015-10-14 06:26:11 UTC (rev 191036)
@@ -2,6 +2,25 @@
More debug queue build fixing.
+ Preserve the build style in one more place. Changed mock build_style from "both"
+ to "release", as we don't support testing both debug and release.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ (MockCommitQueue.archive_last_test_results):
+ (MockCommitQueue):
+ (MockCommitQueue.build_style):
+ (MockCommitQueue.did_pass_testing_ews):
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ (PatchAnalysisTask._test):
+ (PatchAnalysisTask._build_and_test_without_patch):
+ * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+ (EarlyWarningSystemTest._default_expected_logs):
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
+2015-10-13 Alexey Proskuryakov <a...@apple.com>
+
+ More debug queue build fixing.
+
Add build_style argument to derived classes as well.
* Scripts/webkitpy/common/config/ports.py:
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (191035 => 191036)
--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2015-10-14 06:16:36 UTC (rev 191035)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2015-10-14 06:26:11 UTC (rev 191036)
@@ -87,7 +87,7 @@
return archive
def build_style(self):
- return "both"
+ return "release"
def did_pass_testing_ews(self, patch):
return False
@@ -206,9 +206,9 @@
command_passed: success_message='Applied patch' patch='10000'
run_webkit_patch: ['validate-changelog', '--check-oops', '--non-interactive', 10000]
command_passed: success_message='ChangeLog validated' patch='10000'
-run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=release']
command_passed: success_message='Built patch' patch='10000'
-run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
+run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive', '--build-style=release']
command_passed: success_message='Passed tests' patch='10000'
run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
command_passed: success_message='Landed patch' patch='10000'
@@ -226,7 +226,7 @@
command_passed: success_message='Applied patch' patch='10000'
run_webkit_patch: ['validate-changelog', '--check-oops', '--non-interactive', 10000]
command_passed: success_message='ChangeLog validated' patch='10000'
-run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=release']
command_passed: success_message='Built patch' patch='10000'
run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
command_passed: success_message='Landed patch' patch='10000'
@@ -303,9 +303,9 @@
command_passed: success_message='Applied patch' patch='10000'
run_webkit_patch: ['validate-changelog', '--check-oops', '--non-interactive', 10000]
command_passed: success_message='ChangeLog validated' patch='10000'
-run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=release']
command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='10000'
-run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=release']
command_passed: success_message='Able to build without patch' patch='10000'
"""
self._run_through_task(commit_queue, expected_logs, GoldenScriptError)
@@ -327,9 +327,9 @@
command_passed: success_message='Applied patch' patch='10000'
run_webkit_patch: ['validate-changelog', '--check-oops', '--non-interactive', 10000]
command_passed: success_message='ChangeLog validated' patch='10000'
-run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=release']
command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='10000'
-run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=release']
command_failed: failure_message='Unable to build without patch' script_error='MOCK clean build failure' patch='10000'
"""
self._run_through_task(commit_queue, expected_logs, expect_retry=True)
@@ -352,9 +352,9 @@
command_passed: success_message='Applied patch' patch='10000'
run_webkit_patch: ['validate-changelog', '--check-oops', '--non-interactive', 10000]
command_passed: success_message='ChangeLog validated' patch='10000'
-run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=release']
command_passed: success_message='Built patch' patch='10000'
-run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
+run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive', '--build-style=release']
command_passed: success_message='Passed tests' patch='10000'
run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
command_failed: failure_message='Unable to land patch' script_error='MOCK land failure' patch='10000'
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py (191035 => 191036)
--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2015-10-14 06:16:36 UTC (rev 191035)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2015-10-14 06:26:11 UTC (rev 191036)
@@ -146,6 +146,7 @@
# Notice that we don't pass --build, which means we won't build!
"--test",
"--non-interactive",
+ "--build-style=%s" % self._delegate.build_style(),
],
"Passed tests",
"Patch does not pass tests")
@@ -158,6 +159,7 @@
"--build",
"--test",
"--non-interactive",
+ "--build-style=%s" % self._delegate.build_style(),
],
"Able to pass tests without patch",
"Unable to pass tests without patch (tree is red?)")
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (191035 => 191036)
--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2015-10-14 06:16:36 UTC (rev 191035)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2015-10-14 06:26:11 UTC (rev 191036)
@@ -67,7 +67,7 @@
"build_style": ews.build_style(),
}
if ews.run_tests:
- run_tests_line = "Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=%(port)s%(architecture)s\n" % string_replacements
+ run_tests_line = "Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --build-style=%(build_style)s --port=%(port)s%(architecture)s\n" % string_replacements
else:
run_tests_line = ""
string_replacements['run_tests_line'] = run_tests_line
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (191035 => 191036)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2015-10-14 06:16:36 UTC (rev 191035)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2015-10-14 06:26:11 UTC (rev 191036)
@@ -250,7 +250,7 @@
MOCK: update_status: commit-queue ChangeLog validated
Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=mac
MOCK: update_status: commit-queue Built patch
-Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=mac
+Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --build-style=release --port=mac
MOCK: update_status: commit-queue Passed tests
Running: webkit-patch --status-host=example.com land-attachment --force-clean --non-interactive --parent-command=commit-queue 10000 --port=mac
MOCK: update_status: commit-queue Landed patch
@@ -337,7 +337,7 @@
MOCK: update_status: commit-queue ChangeLog validated
Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=%(port)s
MOCK: update_status: commit-queue Built patch
-Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=%(port)s
+Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --build-style=release --port=%(port)s
MOCK: update_status: commit-queue Passed tests
Running: webkit-patch --status-host=example.com land-attachment --force-clean --non-interactive --parent-command=commit-queue 10000 --port=%(port)s
MOCK: update_status: commit-queue Landed patch
@@ -420,7 +420,7 @@
MOCK: update_status: commit-queue ChangeLog validated
Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=mac
MOCK: update_status: commit-queue Built patch
-Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --port=mac
+Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --build-style=release --port=mac
MOCK: update_status: commit-queue Passed tests
MOCK: update_status: commit-queue Error: commit-queue did not process patch.
MOCK: release_work_item: commit-queue 10000
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
