Skip to content

Commit

Permalink
servo: Merge #19003 - Make test-stylo compile an empty crate on Windo…
Browse files Browse the repository at this point in the history
…ws without Gecko (from servo:stylo_tests_windows); r=emilio

That is, in cases where it would fail to link.

This will help make Rust CI be gated on compiling Stylo: rust-lang/rust#44603

Source-Repo: https://github.com/servo/servo
Source-Revision: 38fe9533b93e985657f99a29772bf3d3c8694822

UltraBlame original commit: 6d6d75c9f64f65ecf8c71983a29f036d477c6ed6
  • Loading branch information
marco-c committed Oct 2, 2019
1 parent 79e05e9 commit 1ba9971
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 0 deletions.
7 changes: 7 additions & 0 deletions servo/etc/ci/buildbot_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2254,6 +2254,13 @@ bat
build
-
geckolib
-
mach
.
bat
test
-
stylo
windows
-
msvc
Expand Down
29 changes: 29 additions & 0 deletions servo/tests/unit/stylo/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,4 +652,33 @@ unwrap
(
)
;
if
env
:
:
var_os
(
"
MOZ_SRC
"
)
.
is_some
(
)
{
println
!
(
"
cargo
:
rustc
-
cfg
=
linking_with_gecko
"
)
}
}
15 changes: 15 additions & 0 deletions servo/tests/unit/stylo/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
#
!
[
cfg
(
any
(
linking_with_gecko
not
(
windows
)
)
)
]
extern
crate
atomic_refcell
Expand Down

0 comments on commit 1ba9971

Please sign in to comment.