Skip to content

Commit 4509b49

Browse files
committed
auto merge of #12018 : alexcrichton/rust/triage, r=sfackler
Mostly just test suite modifications.
2 parents 28f277b + 50bdeb9 commit 4509b49

10 files changed

+92
-8
lines changed

mk/tests.mk

+4-3
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
183183
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
184184

185185
check-lite: cleantestlibs cleantmptestlogs \
186-
check-stage2-std check-stage2-extra check-stage2-rpass \
187-
check-stage2-rustuv check-stage2-native check-stage2-green \
186+
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate)) \
187+
check-stage2-rpass \
188188
check-stage2-rfail check-stage2-cfail check-stage2-rmake
189189
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
190190

@@ -861,7 +861,8 @@ $(foreach host,$(CFG_HOST), \
861861
$(eval $(foreach target,$(CFG_TARGET), \
862862
$(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
863863

864-
check-fast: tidy check-fast-H-$(CFG_BUILD) check-stage2-std check-stage2-extra
864+
check-fast: tidy check-fast-H-$(CFG_BUILD) \
865+
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate))
865866
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
866867

867868
define DEF_CHECK_FAST_FOR_H

src/test/auxiliary/issue-5521.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#[feature(managed_boxes)];
12+
13+
use std::hashmap::HashMap;
14+
15+
pub type map = @HashMap<uint, uint>;

src/test/compile-fail/struct-no-fields-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
1211
struct Foo;
1312

1413
fn f2() {
1514
let _end_stmt = Foo { };
15+
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
1616
}
1717

1818
fn main() {}

src/test/compile-fail/struct-no-fields-3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
1211
struct Foo;
1312

1413
fn g3() {
1514
let _mid_tuple = (Foo { }, 2);
15+
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
1616
}
1717

1818
fn main() {}

src/test/compile-fail/struct-no-fields-4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
1211
struct Foo;
1312

1413
fn h4() {
1514
let _end_of_tuple = (3, Foo { });
15+
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
1616
}
1717

1818
fn main() {}

src/test/compile-fail/struct-no-fields-5.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: Unit-like struct construction is written with no trailing `{ }`
1211
struct Foo;
1312

1413
fn i5() {
1514
let _end_of_block = { Foo { } };
15+
//~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
1616
}
1717

1818
fn main() {}

src/test/compile-fail/struct-no-fields.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// error-pattern: Unit-like struct definition should be written as `struct Foo;`
1211
struct Foo {}
12+
//~^ ERROR: Unit-like struct definition should be written as `struct Foo;`
1313

1414
fn main() {}

src/test/run-pass/issue-10714.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
enum v {}
12+
pub fn main() {
13+
let y: v = unsafe { ::std::unstable::intrinsics::uninit() };
14+
}

src/test/run-pass/issue-5521.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// aux-build:issue-5521.rs
12+
// xfail-fast
13+
14+
#[feature(managed_boxes)];
15+
16+
extern mod foo = "issue-5521";
17+
18+
fn foo(a: foo::map) {
19+
if false {
20+
fail!();
21+
} else {
22+
let _b = a.get(&2);
23+
}
24+
}
25+
26+
fn main() {}

src/test/run-pass/issue-9396.rs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use std::comm;
12+
use std::io::timer::Timer;
13+
14+
pub fn main() {
15+
let (port, chan) = Chan::new();
16+
spawn(proc (){
17+
let mut timer = Timer::new().unwrap();
18+
timer.sleep(10);
19+
chan.send(());
20+
});
21+
loop {
22+
match port.try_recv() {
23+
comm::Data(()) => break,
24+
comm::Empty => {}
25+
comm::Disconnected => unreachable!()
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)