Skip to content

Commit

Permalink
test: Don't share auxiliary modules
Browse files Browse the repository at this point in the history
  • Loading branch information
lht committed Apr 8, 2012
1 parent cc66599 commit 2ce2889
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
7 changes: 7 additions & 0 deletions src/test/auxiliary/crateresolve7-1.rs
@@ -0,0 +1,7 @@
#[link(name = "crateresolve7",
vers = "0.1",
calories = "100")];

#[crate_type = "lib"];

fn f() -> int { 100 }
7 changes: 7 additions & 0 deletions src/test/auxiliary/crateresolve7-2.rs
@@ -0,0 +1,7 @@
#[link(name = "crateresolve7",
vers = "0.1",
calories = "200")];

#[crate_type = "lib"];

fn f() -> int { 200 }
12 changes: 6 additions & 6 deletions src/test/auxiliary/crateresolve7x.rs
@@ -1,14 +1,14 @@
// xfail-fast
// aux-build:crateresolve6-1.rs
// aux-build:crateresolve6-2.rs
// aux-build:crateresolve7-1.rs
// aux-build:crateresolve7-2.rs

// These both have the same version but differ in other metadata
mod a {
use cr6_1 (name = "crateresolve6", vers = "0.1", calories="100");
fn f() -> int { cr6_1::f() }
use cr7_1 (name = "crateresolve7", vers = "0.1", calories="100");
fn f() -> int { cr7_1::f() }
}

mod b {
use cr6_2 (name = "crateresolve6", vers = "0.1", calories="200");
fn f() -> int { cr6_2::f() }
use cr7_2 (name = "crateresolve7", vers = "0.1", calories="200");
fn f() -> int { cr7_2::f() }
}
4 changes: 2 additions & 2 deletions src/test/run-pass/crateresolve7.rs
@@ -1,6 +1,6 @@
// xfail-fast
// aux-build:crateresolve6-1.rs
// aux-build:crateresolve6-2.rs
// aux-build:crateresolve7-1.rs
// aux-build:crateresolve7-2.rs
// aux-build:crateresolve7x.rs

use crateresolve7x;
Expand Down

0 comments on commit 2ce2889

Please sign in to comment.