mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Merge gfx and gfx_tests
This commit is contained in:
parent
a17a1fd06e
commit
c2ed7c9632
7 changed files with 6 additions and 37 deletions
10
Cargo.lock
generated
10
Cargo.lock
generated
|
@ -1101,16 +1101,6 @@ dependencies = [
|
||||||
"xml5ever 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"xml5ever 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "gfx_tests"
|
|
||||||
version = "0.0.1"
|
|
||||||
dependencies = [
|
|
||||||
"cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"gfx 0.0.1",
|
|
||||||
"ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"style 0.0.1",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gfx_traits"
|
name = "gfx_traits"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
|
|
|
@ -9,6 +9,8 @@ publish = false
|
||||||
[lib]
|
[lib]
|
||||||
name = "gfx"
|
name = "gfx"
|
||||||
path = "lib.rs"
|
path = "lib.rs"
|
||||||
|
test = false
|
||||||
|
doctest = false
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
unstable = ["simd"]
|
unstable = ["simd"]
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
extern crate gfx;
|
||||||
|
|
||||||
use gfx::text::util::{CompressionMode, transform_text};
|
use gfx::text::util::{CompressionMode, transform_text};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
|
@ -392,7 +392,7 @@ impl<'a> GlyphInfo<'a> {
|
||||||
/// Simple glyphs are stored inline in the `entry_buffer`, detailed glyphs are
|
/// Simple glyphs are stored inline in the `entry_buffer`, detailed glyphs are
|
||||||
/// stored as pointers into the `detail_store`.
|
/// stored as pointers into the `detail_store`.
|
||||||
///
|
///
|
||||||
/// ~~~ignore
|
/// ~~~ascii
|
||||||
/// +- GlyphStore --------------------------------+
|
/// +- GlyphStore --------------------------------+
|
||||||
/// | +---+---+---+---+---+---+---+ |
|
/// | +---+---+---+---+---+---+---+ |
|
||||||
/// | entry_buffer: | | s | | s | | s | s | | d = detailed
|
/// | entry_buffer: | | s | | s | | s | s | | d = detailed
|
||||||
|
|
|
@ -231,7 +231,7 @@ class MachCommands(CommandBase):
|
||||||
else:
|
else:
|
||||||
test_patterns.append(test)
|
test_patterns.append(test)
|
||||||
|
|
||||||
self_contained_tests = ["msg", "selectors"]
|
self_contained_tests = ["gfx", "msg", "selectors"]
|
||||||
if not packages:
|
if not packages:
|
||||||
packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
|
packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
|
||||||
packages |= set(self_contained_tests)
|
packages |= set(self_contained_tests)
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "gfx_tests"
|
|
||||||
version = "0.0.1"
|
|
||||||
authors = ["The Servo Project Developers"]
|
|
||||||
license = "MPL-2.0"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "gfx_tests"
|
|
||||||
path = "lib.rs"
|
|
||||||
doctest = false
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
cssparser = "0.23.0"
|
|
||||||
gfx = {path = "../../../components/gfx"}
|
|
||||||
ipc-channel = "0.9"
|
|
||||||
style = {path = "../../../components/style"}
|
|
|
@ -1,9 +0,0 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
#![cfg(test)]
|
|
||||||
|
|
||||||
extern crate gfx;
|
|
||||||
|
|
||||||
mod text_util;
|
|
Loading…
Add table
Add a link
Reference in a new issue