auto merge of #12018 : alexcrichton/rust/triage, r=sfackler
Mostly just test suite modifications.
This commit is contained in:
commit
4509b49451
10 changed files with 92 additions and 8 deletions
|
@ -183,8 +183,8 @@ check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
|
|||
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
||||
|
||||
check-lite: cleantestlibs cleantmptestlogs \
|
||||
check-stage2-std check-stage2-extra check-stage2-rpass \
|
||||
check-stage2-rustuv check-stage2-native check-stage2-green \
|
||||
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \
|
||||
check-stage2-rpass \
|
||||
check-stage2-rfail check-stage2-cfail check-stage2-rmake
|
||||
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
||||
|
||||
|
@ -861,7 +861,8 @@ $(foreach host,$(CFG_HOST), \
|
|||
$(eval $(foreach target,$(CFG_TARGET), \
|
||||
$(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
|
||||
|
||||
check-fast: tidy check-fast-H-$(CFG_BUILD) check-stage2-std check-stage2-extra
|
||||
check-fast: tidy check-fast-H-$(CFG_BUILD) \
|
||||
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate))
|
||||
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
|
||||
|
||||
define DEF_CHECK_FAST_FOR_H
|
||||
|
|
15
src/test/auxiliary/issue-5521.rs
Normal file
15
src/test/auxiliary/issue-5521.rs
Normal file
|
@ -0,0 +1,15 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#[feature(managed_boxes)];
|
||||
|
||||
use std::hashmap::HashMap;
|
||||
|
||||
pub type map = @HashMap<uint, uint>;
|
|
@ -8,11 +8,11 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
|
||||
struct Foo;
|
||||
|
||||
fn f2() {
|
||||
let _end_stmt = Foo { };
|
||||
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
|
||||
struct Foo;
|
||||
|
||||
fn g3() {
|
||||
let _mid_tuple = (Foo { }, 2);
|
||||
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
|
||||
struct Foo;
|
||||
|
||||
fn h4() {
|
||||
let _end_of_tuple = (3, Foo { });
|
||||
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
|
||||
struct Foo;
|
||||
|
||||
fn i5() {
|
||||
let _end_of_block = { Foo { } };
|
||||
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// error-pattern: Unit-like struct definition should be written as `struct Foo;`
|
||||
struct Foo {}
|
||||
//~^ ERROR: Unit-like struct definition should be written as `struct Foo;`
|
||||
|
||||
fn main() {}
|
||||
|
|
14
src/test/run-pass/issue-10714.rs
Normal file
14
src/test/run-pass/issue-10714.rs
Normal file
|
@ -0,0 +1,14 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
enum v {}
|
||||
pub fn main() {
|
||||
let y: v = unsafe { ::std::unstable::intrinsics::uninit() };
|
||||
}
|
26
src/test/run-pass/issue-5521.rs
Normal file
26
src/test/run-pass/issue-5521.rs
Normal file
|
@ -0,0 +1,26 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// aux-build:issue-5521.rs
|
||||
// xfail-fast
|
||||
|
||||
#[feature(managed_boxes)];
|
||||
|
||||
extern mod foo = "issue-5521";
|
||||
|
||||
fn foo(a: foo::map) {
|
||||
if false {
|
||||
fail!();
|
||||
} else {
|
||||
let _b = a.get(&2);
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {}
|
28
src/test/run-pass/issue-9396.rs
Normal file
28
src/test/run-pass/issue-9396.rs
Normal file
|
@ -0,0 +1,28 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use std::comm;
|
||||
use std::io::timer::Timer;
|
||||
|
||||
pub fn main() {
|
||||
let (port, chan) = Chan::new();
|
||||
spawn(proc (){
|
||||
let mut timer = Timer::new().unwrap();
|
||||
timer.sleep(10);
|
||||
chan.send(());
|
||||
});
|
||||
loop {
|
||||
match port.try_recv() {
|
||||
comm::Data(()) => break,
|
||||
comm::Empty => {}
|
||||
comm::Disconnected => unreachable!()
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue