Skip to content

/ servo

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

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 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
@Manishearth
Copy link
Member

Manishearth commented Jan 6, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jan 6, 2017

📌 Commit f03aa2c has been approved by Manishearth
@highfive highfive assigned Manishearth and unassigned emilio Jan 6, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jan 6, 2017

☔ The latest upstream changes (presumably #14871) made this pull request unmergeable. Please resolve the merge conflicts.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 6, 2017

🔒 Merge conflict
@mbrubeck mbrubeck force-pushed the mbrubeck:always-be-updating branch from f03aa2c to 6b48fb8 Jan 6, 2017
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Jan 6, 2017

@bors-servo r=Manishearth

  • rebased
@bors-servo
Copy link
Contributor

bors-servo commented Jan 6, 2017

📌 Commit 6b48fb8 has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jan 6, 2017

⌛ Testing commit 6b48fb8 with merge c92f5bd...
bors-servo added a commit that referenced this pull request Jan 6, 2017
@bors-servo
Auto merge of #14874 - mbrubeck:always-be-updating, r=Manishearth
Loading status checks…
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

bors-servo commented Jan 6, 2017

💔 Test failed - mac-rel-wpt2
@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
@mbrubeck
Update url, num_cpus, heapsize, webdriver.
Loading status checks…
6f3831b
@mbrubeck mbrubeck force-pushed the mbrubeck:always-be-updating branch from 6b48fb8 to 6f3831b 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

bors-servo commented Jan 6, 2017

📌 Commit 6f3831b has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jan 7, 2017

⌛ Testing commit 6f3831b with merge 3b2a066...
bors-servo added a commit that referenced this pull request Jan 7, 2017
@bors-servo
Auto merge of #14874 - mbrubeck:always-be-updating, r=Manishearth
Loading status checks…
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

bors-servo commented Jan 7, 2017

⛄ The build was interrupted to prioritize another pull request.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 7, 2017

⚡ 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

bors-servo commented Jan 7, 2017

☀️ 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
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@mbrubeck @highfive @Manishearth @bors-servo @jdm @emilio
You can’t perform that action at this time.