mirror of
https://github.com/servo/servo.git
synced 2025-08-07 14:35:33 +01:00
Update tests for language changes
This commit is contained in:
parent
ef0423d89a
commit
6a92e84105
8 changed files with 19 additions and 16 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit bf9e050161c55ce06f8e7491e15ceff06079d937
|
Subproject commit c8cf6f388da1446b267014154b36af85a752a438
|
|
@ -1 +1 @@
|
||||||
Subproject commit 01d8691bdf721edebb0e563069ffb23ba123bef0
|
Subproject commit 488df0c7cd29cc58002eb9ccf3ae864de08c6e50
|
|
@ -1 +1 @@
|
||||||
Subproject commit 12106aba8797163a958ce97dacb2900e931f1cc5
|
Subproject commit 6e1ef6cf8bd81b3587a124acd8e601b935f96536
|
|
@ -1 +1 @@
|
||||||
Subproject commit 0961ae2fc54e71838dd495bd91f5b7aa5afa1993
|
Subproject commit fce9c5b323bd47f94682cb344afebadd2e2c3a45
|
|
@ -1 +1 @@
|
||||||
Subproject commit dbc46d10beb7e2c542f90ea13952b0c5514667d7
|
Subproject commit 474d25966ead7efe73bfa26cbdc3d09c54b7b941
|
|
@ -31,14 +31,15 @@ pub impl QuartzFontListHandle {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_available_families() -> FontFamilyMap {
|
fn get_available_families() -> FontFamilyMap {
|
||||||
let family_names = quartz::font_list::core_text::font_collection::get_family_names();
|
let family_names: CFArray<CFStringRef> =
|
||||||
|
quartz::font_list::core_text::font_collection::get_family_names();
|
||||||
let mut family_map : FontFamilyMap = LinearMap::new();
|
let mut family_map : FontFamilyMap = LinearMap::new();
|
||||||
for family_names.each |strref: &CFStringRef| {
|
for family_names.each |strref: &CFStringRef| {
|
||||||
let family_name = CFWrapper::wrap_shared(*strref).to_str();
|
/*let family_name = CFWrapper::wrap_shared(strref).to_str();
|
||||||
debug!("Creating new FontFamily for family: %s", family_name);
|
debug!("Creating new FontFamily for family: %s", family_name);
|
||||||
|
|
||||||
let new_family = @FontFamily::new(family_name);
|
let new_family = @FontFamily::new(family_name);
|
||||||
family_map.insert(move family_name, new_family);
|
family_map.insert(move family_name, new_family);*/
|
||||||
}
|
}
|
||||||
return move family_map;
|
return move family_map;
|
||||||
}
|
}
|
||||||
|
|
|
@ -275,7 +275,7 @@ impl<T:Copy Owned,A> Scope<T,A> {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[allow(non_implicitly_copyable_typarams)]
|
#[allow(non_implicitly_copyable_typarams)]
|
||||||
mod test {
|
mod test {
|
||||||
use pipes::stream;
|
use pipes::{SharedChan, stream};
|
||||||
use super::Scope;
|
use super::Scope;
|
||||||
|
|
||||||
type animal = {name: ~str, species: species};
|
type animal = {name: ~str, species: species};
|
||||||
|
@ -323,18 +323,20 @@ mod test {
|
||||||
|
|
||||||
let iter1 = 3u;
|
let iter1 = 3u;
|
||||||
let iter2 = 22u;
|
let iter2 = 22u;
|
||||||
let read_port = oldcomm::Port();
|
let (read_port, read_chan) = stream();
|
||||||
let read_chan = oldcomm::Chan(&read_port);
|
let read_chan = SharedChan(read_chan);
|
||||||
|
|
||||||
// fire up a reader task
|
// fire up a reader task
|
||||||
for uint::range(0u, iter1) |i| {
|
for uint::range(0u, iter1) |i| {
|
||||||
s.reader_forked();
|
s.reader_forked();
|
||||||
let (wait_port, wait_chan) = stream();
|
let (wait_port, wait_chan) = stream();
|
||||||
|
|
||||||
|
let read_chan = read_chan.clone();
|
||||||
do task::spawn {
|
do task::spawn {
|
||||||
|
let read_chan = read_chan.clone();
|
||||||
for uint::range(0u, iter2) |_i| {
|
for uint::range(0u, iter2) |_i| {
|
||||||
oldcomm::send(read_chan, henrietta.read(read_characteristic));
|
read_chan.send(henrietta.read(read_characteristic));
|
||||||
oldcomm::send(read_chan, ferdinand.read(read_characteristic));
|
read_chan.send(ferdinand.read(read_characteristic));
|
||||||
wait_port.recv();
|
wait_port.recv();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +348,9 @@ mod test {
|
||||||
assert frc == i * iter2;
|
assert frc == i * iter2;
|
||||||
|
|
||||||
for uint::range(0u, iter2) |_i| {
|
for uint::range(0u, iter2) |_i| {
|
||||||
assert hrc == oldcomm::recv(read_port);
|
assert hrc == read_port.recv();
|
||||||
s.write(&henrietta, mutate);
|
s.write(&henrietta, mutate);
|
||||||
assert frc == oldcomm::recv(read_port);
|
assert frc == read_port.recv();
|
||||||
s.write(&ferdinand, mutate);
|
s.write(&ferdinand, mutate);
|
||||||
wait_chan.send(());
|
wait_chan.send(());
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 355fdfa0e715ef7cc11156071c6b4fbcf4ede057
|
Subproject commit 0beee76601f94c5601357c239e5e850266a47c2a
|
Loading…
Add table
Add a link
Reference in a new issue