Skip to content

Commit

Permalink
Split cross-crate test into own test and xfail-fast it
Browse files Browse the repository at this point in the history
  • Loading branch information
bytwise committed Aug 21, 2013
1 parent cc0c6fd commit 0f6dd53
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/test/auxiliary/static-function-pointer-aux.rs
@@ -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.
//
Expand All @@ -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 changes: 26 additions & 0 deletions src/test/run-pass/static-function-pointer-xc.rs
@@ -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 changes: 1 addition & 10 deletions src/test/run-pass/static-function-pointer.rs
@@ -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.
//
Expand All @@ -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 }

Expand All @@ -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);
}
}

0 comments on commit 0f6dd53

Please sign in to comment.