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.

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

Make the global options more resilient to unit tests running in paral… #6681

Merged
merged 1 commit into from Jul 21, 2015

Conversation

@jdm
Copy link
Member

jdm commented Jul 21, 2015

…lel.

This should allow #6490 to land, since it's hitting problems with unit tests that create a resource task and therefore race on calling opts::get().

Review on Reviewable

@highfive
Copy link

highfive commented Jul 21, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jul 21, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5611

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm jdm force-pushed the jdm:atomicopts branch from 431d3d7 to 0bf1975 Jul 21, 2015
@SimonSapin
Copy link
Member

SimonSapin commented Jul 21, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

📌 Commit 0bf1975 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

Testing commit 0bf1975 with merge 25883c6...

bors-servo pushed a commit that referenced this pull request Jul 21, 2015
Make the global options more resilient to unit tests running in paral…

…lel.

This should allow #6490 to land, since it's hitting problems with unit tests that create a resource task and therefore race on calling opts::get().

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6681)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

💔 Test failed - mac2

@jdm jdm force-pushed the jdm:atomicopts branch from 0bf1975 to fecb2e3 Jul 21, 2015
@jdm
Copy link
Member Author

jdm commented Jul 21, 2015

@bors-servo: r=SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

📌 Commit fecb2e3 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

Testing commit fecb2e3 with merge 126f5ae...

bors-servo pushed a commit that referenced this pull request Jul 21, 2015
Make the global options more resilient to unit tests running in paral…

…lel.

This should allow #6490 to land, since it's hitting problems with unit tests that create a resource task and therefore race on calling opts::get().

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6681)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

💔 Test failed - mac1

@jdm
Copy link
Member Author

jdm commented Jul 21, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

Previous build results for android, gonk, linux1, linux2, linux3, mac2, mac3 are reusable. Rebuilding only mac1...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3

@bors-servo bors-servo merged commit fecb2e3 into servo:master Jul 21, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@jdm jdm deleted the jdm:atomicopts branch Aug 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.