squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Split cross-crate test into own test and xfail-fast it

Browse source
This commit is contained in:
Andreas Martens 2013-08-21 17:29:47 +02:00
parent cc0c6fd43c
commit 0f6dd53948
3 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/test/auxiliary/static-function-pointer-aux.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn f(x: int) -> int { -x }
pub fn f(x: int) -> int { -x }
pub static F: extern fn(int) -> int = f;
pub static mut MutF: extern fn(int) -> int = f;

26
src/test/run-pass/static-function-pointer-xc.rs Normal file
View file

@ -0,0 +1,26 @@
// Copyright 2013 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.
// xfail-fast
// aux-build:static-function-pointer-aux.rs
extern mod aux(name = "static-function-pointer-aux");
fn f(x: int) -> int { x }
fn main() {
assert_eq!(aux::F(42), -42);
unsafe {
assert_eq!(aux::MutF(42), -42);
aux::MutF = f;
assert_eq!(aux::MutF(42), 42);
aux::MutF = aux::f;
assert_eq!(aux::MutF(42), -42);
}
}

11
src/test/run-pass/static-function-pointer.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -8,9 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// aux-build:static-function-pointer-aux.rs
extern mod aux(name = "static-function-pointer-aux");
fn f(x: int) -> int { x }
fn g(x: int) -> int { 2 * x }
@ -24,10 +21,4 @@ fn main() {
G = g;
assert_eq!(G(42), 84);
}
assert_eq!(aux::F(42), -42);
unsafe {
assert_eq!(aux::MutF(42), -42);
aux::MutF = f;
assert_eq!(aux::MutF(42), 42);
}
}