mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #22272 - georgeroman:kill_test_processes_on_any_error, r=jdm
Kill test processes whenever any error occurs <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #21822 <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22272) <!-- Reviewable:end -->
This commit is contained in:
commit
d81798696d
2 changed files with 2 additions and 2 deletions
|
@ -671119,7 +671119,7 @@
|
|||
"support"
|
||||
],
|
||||
"tools/wptrunner/wptrunner/executors/executorservo.py": [
|
||||
"49b682c749f897eb234c6bf4bb7ade3ed021dd7b",
|
||||
"784356bb8b0c2b4e12cf53bb0ba90a9a3ffe39c2",
|
||||
"support"
|
||||
],
|
||||
"tools/wptrunner/wptrunner/executors/executorservodriver.py": [
|
||||
|
|
|
@ -122,7 +122,7 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
|
|||
self.proc.wait()
|
||||
else:
|
||||
self.proc.kill()
|
||||
except KeyboardInterrupt:
|
||||
except:
|
||||
self.proc.kill()
|
||||
raise
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue