Fix Stylo tests to pass on both Stable and Nightly Rust.

This is on top of https://github.com/servo/servo/pull/19285.

Rust Nightly has new enum memory layout optimizations:
https://github.com/rust-lang/rust/pull/45225
This commit is contained in:
Simon Sapin 2017-11-21 12:15:06 +01:00
parent 6031de9a39
commit aaba33e56b
7 changed files with 25 additions and 4 deletions

View file

@ -76,6 +76,16 @@ fn generate_properties() {
.arg(&script)
.arg(product)
.arg("style-crate")
.envs(if std::mem::size_of::<Option<bool>>() == 1 {
// FIXME: remove this envs() call
// and make unconditional code that depends on RUSTC_HAS_PR45225
// once Firefox requires Rust 1.23+
// https://github.com/rust-lang/rust/pull/45225
vec![("RUSTC_HAS_PR45225", "1")]
} else {
vec![]
})
.status()
.unwrap();
if !status.success() {