diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-14 14:16:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 14:16:44 -0500 |
| commit | 6558e01dca5889f18af6a2e0969b899b1dc00ad6 (patch) | |
| tree | d72e0be6a33bda60aab948363d75d778b28c6091 | |
| parent | ac5da66a4f2cace3675e34abf74f7ab7e80533b2 (diff) | |
| parent | 9442ccb81c87886eb062fa085886f615b3cff6e5 (diff) | |
| download | servo-6558e01dca5889f18af6a2e0969b899b1dc00ad6.tar.gz servo-6558e01dca5889f18af6a2e0969b899b1dc00ad6.zip | |
Auto merge of #18881 - emilio:osmesa-up, r=nox
Update OSMesa.
<!-- 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/18881)
<!-- Reviewable:end -->
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0cb0fa9c055..19ac18f08fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1188,7 +1188,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "osmesa-src 17.2.0-devel (git+https://github.com/servo/osmesa-src)", + "osmesa-src 17.3.0-devel (git+https://github.com/servo/osmesa-src)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2212,8 +2212,8 @@ dependencies = [ [[package]] name = "osmesa-src" -version = "17.2.0-devel" -source = "git+https://github.com/servo/osmesa-src#206464252f31583c2338393f8b6da99780a1ebdf" +version = "17.3.0-devel" +source = "git+https://github.com/servo/osmesa-src#100789c549a5716773a74a5db0a2e929470e2c9f" [[package]] name = "osmesa-sys" @@ -3938,7 +3938,7 @@ dependencies = [ "checksum openssl 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bb5d1663b73d10c6a3eda53e2e9d0346f822394e7b858d7257718f65f61dfbe2" "checksum openssl-sys 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)" = "3a5886d87d3e2a0d890bf62dc8944f5e3769a405f7e1e9ef6e517e47fd7a0897" "checksum ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da12c96037889ae0be29dd2bdd260e5a62a7df24e6466d5a15bb8131c1c200a8" -"checksum osmesa-src 17.2.0-devel (git+https://github.com/servo/osmesa-src)" = "<none>" +"checksum osmesa-src 17.3.0-devel (git+https://github.com/servo/osmesa-src)" = "<none>" "checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" "checksum ovr-mobile-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7b5f9389b2015f8340f0566c488f3e96735e2e8fd7b85d571832cd274ac2998" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" diff --git a/tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini b/tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini deleted file mode 100644 index 7ce4f1d5bd2..00000000000 --- a/tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border_radius_zero_sizes_a.html] - type: reftest - expected: FAIL |