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

Update url, num_cpus, heapsize, webdriver. #14874

Merged
merged 1 commit into from Jan 7, 2017
Merged

Update url, num_cpus, heapsize, webdriver. #14874

merged 1 commit into from Jan 7, 2017

Conversation

mbrubeck
Copy link
Contributor

@mbrubeck mbrubeck commented Jan 6, 2017 •
edited by larsbergstrom

This change is Reviewable

@highfive
Copy link

highfive commented Jan 6, 2017

Heads up! This PR modifies the following files:

  • @asajeffrey: components/webdriver_server/Cargo.toml, components/webdriver_server/lib.rs
  • @jgraham: components/webdriver_server/Cargo.toml, components/webdriver_server/lib.rs

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

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit f03aa2c has been approved by Manishearth

@highfive highfive assigned Manishearth and unassigned emilio Jan 6, 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 Jan 6, 2017
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #14871) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 6, 2017
@bors-servo
Copy link
Contributor

🔒 Merge conflict

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jan 6, 2017
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Jan 6, 2017

@bors-servo r=Manishearth

  • rebased

@bors-servo
Copy link
Contributor

📌 Commit 6b48fb8 has been approved by Manishearth

@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. S-needs-rebase There are merge conflict errors. labels Jan 6, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 6b48fb8 with merge c92f5bd...

bors-servo pushed a commit that referenced this pull request Jan 6, 2017
Auto merge of #14874 - mbrubeck:always-be-updating, r=Manishearth
c92f5bd 
Update url, num_cpus, heapsize, webdriver.

<!-- 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/14874)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt2

@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 Jan 6, 2017
@jdm
Copy link
Member

jdm commented Jan 6, 2017 

  ▶ Unexpected subtest result in /url/a-element-origin-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing origin: <http://[::127.0.0.1]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-origin-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing origin: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-origin.html:
  └ PASS [expected FAIL] Parsing origin: <http://[::127.0.0.1]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-origin.html:
  └ PASS [expected FAIL] Parsing origin: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <http://[::127.0.0.1]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <#\u03b2> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <http://www.google.com/foo?bar=baz# \xbb> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <data:test# \xbb> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element-xhtml.xhtml:
  └ PASS [expected FAIL] Parsing: <http://foo.bar/baz?qux#foo\x08bar> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <http://[::127.0.0.1]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <#\u03b2> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <http://www.google.com/foo?bar=baz# \xbb> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <data:test# \xbb> against <about:blank>

  ▶ Unexpected subtest result in /url/a-element.html:
  └ PASS [expected FAIL] Parsing: <http://foo.bar/baz?qux#foo\x08bar> against <about:blank>

  ▶ Unexpected subtest result in /url/url-constructor.html:
  └ PASS [expected FAIL] Parsing: <http://[::127.0.0.1]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/url-constructor.html:
  └ PASS [expected FAIL] Parsing: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/url-constructor.html:
  └ PASS [expected FAIL] Parsing: <#\u03b2> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/url-constructor.html:
  └ PASS [expected FAIL] Parsing: <http://www.google.com/foo?bar=baz# \xbb> against <about:blank>

  ▶ Unexpected subtest result in /url/url-constructor.html:
  └ PASS [expected FAIL] Parsing: <data:test# \xbb> against <about:blank>

  ▶ Unexpected subtest result in /url/url-origin.html:
  └ PASS [expected FAIL] Origin parsing: <http://[::127.0.0.1]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/url-origin.html:
  └ PASS [expected FAIL] Origin parsing: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar>

  ▶ Unexpected subtest result in /url/url-setters.html:
  └ PASS [expected FAIL] URL: Setting <http://example.net>.hash = '%c3%89t\xe9' Bytes already percent-encoded are left as-is

  ▶ Unexpected subtest result in /url/url-setters.html:
  └ PASS [expected FAIL] <a>: Setting <http://example.net>.hash = '%c3%89t\xe9' Bytes already percent-encoded are left as-is

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 6, 2017
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Jan 6, 2017

@bors-servo r=Manishearth

  • updated test expectations

@bors-servo
Copy link
Contributor

📌 Commit 6f3831b has been approved by Manishearth

@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 Jan 6, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 6f3831b with merge 3b2a066...

bors-servo pushed a commit that referenced this pull request Jan 7, 2017
Auto merge of #14874 - mbrubeck:always-be-updating, r=Manishearth
3b2a066 
Update url, num_cpus, heapsize, webdriver.

<!-- 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/14874)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

⛄ The build was interrupted to prioritize another pull request.

@bors-servo
Copy link
Contributor

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

@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev

@bors-servo bors-servo merged commit 6f3831b into servo:master Jan 7, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jan 7, 2017
This was referenced Jan 7, 2017
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@mbrubeck @highfive @Manishearth @bors-servo @jdm @emilio