Skip to content

Commit 2ce2889

Browse files
committed
test: Don't share auxiliary modules
1 parent cc66599 commit 2ce2889

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

src/test/auxiliary/crateresolve7-1.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#[link(name = "crateresolve7",
2+
vers = "0.1",
3+
calories = "100")];
4+
5+
#[crate_type = "lib"];
6+
7+
fn f() -> int { 100 }

src/test/auxiliary/crateresolve7-2.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#[link(name = "crateresolve7",
2+
vers = "0.1",
3+
calories = "200")];
4+
5+
#[crate_type = "lib"];
6+
7+
fn f() -> int { 200 }

src/test/auxiliary/crateresolve7x.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// xfail-fast
2-
// aux-build:crateresolve6-1.rs
3-
// aux-build:crateresolve6-2.rs
2+
// aux-build:crateresolve7-1.rs
3+
// aux-build:crateresolve7-2.rs
44

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

1111
mod b {
12-
use cr6_2 (name = "crateresolve6", vers = "0.1", calories="200");
13-
fn f() -> int { cr6_2::f() }
12+
use cr7_2 (name = "crateresolve7", vers = "0.1", calories="200");
13+
fn f() -> int { cr7_2::f() }
1414
}

src/test/run-pass/crateresolve7.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// xfail-fast
2-
// aux-build:crateresolve6-1.rs
3-
// aux-build:crateresolve6-2.rs
2+
// aux-build:crateresolve7-1.rs
3+
// aux-build:crateresolve7-2.rs
44
// aux-build:crateresolve7x.rs
55

66
use crateresolve7x;

0 commit comments

Comments
 (0)