Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move the trap instruction in /etc/ci/performance/test_all.sh. #19474

Merged
merged 1 commit into from Dec 4, 2017
Merged

Move the trap instruction in /etc/ci/performance/test_all.sh. #19474

merged 1 commit into from Dec 4, 2017

Conversation

asajeffrey
Copy link
Member

@asajeffrey asajeffrey commented Dec 4, 2017 •
edited by SimonSapin

At the moment if the performance tests fail, the local server doesn't get killed, because the trap instruction is after the test run. This PR moves it to before.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because this is test infrastructure

This change is Reviewable

@highfive
Copy link

highfive commented Dec 4, 2017

Heads up! This PR modifies the following files:

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Dec 4, 2017
@jdm
Copy link
Member

jdm commented Dec 4, 2017

@bors-servo: r+ p=999

@bors-servo
Copy link
Contributor

📌 Commit d13ff4d has been approved by jdm

@bors-servo
Copy link
Contributor

🌲 The tree is currently closed for pull requests below priority 9000, this pull request will be tested once the tree is reopened

@highfive highfive assigned jdm and unassigned KiChjang Dec 4, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Dec 4, 2017
@jdm
Copy link
Member

jdm commented Dec 4, 2017

@bors-servo: treeclosed-

@bors-servo
Copy link
Contributor

⌛ Testing commit d13ff4d with merge 9f117ae...

bors-servo pushed a commit that referenced this pull request Dec 4, 2017
Auto merge of #19474 - asajeffrey:test-perf-move-trap, r=jdm
9f117ae 
Move the trap instruction in /etc/ci/performance/test_all.sh.

<!-- Please describe your changes on the following line: -->

At the moment if the performance tests fail, the local server doesn't get killed, because the trap instruction is after the test run. This PR moves it to before.

---
<!-- 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 do not require tests because this is test infrastructure

<!-- 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/19474)
<!-- Reviewable:end -->
@asajeffrey
Copy link
Member Author

Turns out this was causing major CI problems due to wpt failing to start it's http server, and using the test-perf one instead.

@jdm
Copy link
Member

jdm commented Dec 4, 2017

@bors-servo: treeclosed=9000

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Dec 4, 2017
@jdm
Copy link
Member

jdm commented Dec 4, 2017

@bors-servo: retry

@jdm
Copy link
Member

jdm commented Dec 4, 2017

@bors-servo treeclosed-

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-css, linux-rel-wpt...

@atouchet
Copy link
Contributor

atouchet commented Dec 4, 2017 •
edited

Sorry, accidental click.

@atouchet atouchet removed the request for review from shinglyu December 4, 2017 19:11
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing 9f117ae to master...

@bors-servo bors-servo merged commit d13ff4d into servo:master Dec 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@asajeffrey @highfive @jdm @bors-servo @atouchet @KiChjang