From 2ce28899e477eb4ccadc4f293651d93febf471f3 Mon Sep 17 00:00:00 2001
From: Haitao Li <lihaitao@gmail.com>
Date: Sun, 8 Apr 2012 23:46:50 +0800
Subject: [PATCH] test: Don't share auxiliary modules

---
 src/test/auxiliary/crateresolve7-1.rs |  7 +++++++
 src/test/auxiliary/crateresolve7-2.rs |  7 +++++++
 src/test/auxiliary/crateresolve7x.rs  | 12 ++++++------
 src/test/run-pass/crateresolve7.rs    |  4 ++--
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 src/test/auxiliary/crateresolve7-1.rs
 create mode 100644 src/test/auxiliary/crateresolve7-2.rs

diff --git a/src/test/auxiliary/crateresolve7-1.rs b/src/test/auxiliary/crateresolve7-1.rs
new file mode 100644
index 00000000000..435750523ba
--- /dev/null
+++ b/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 }
diff --git a/src/test/auxiliary/crateresolve7-2.rs b/src/test/auxiliary/crateresolve7-2.rs
new file mode 100644
index 00000000000..eeb9684dc67
--- /dev/null
+++ b/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 }
diff --git a/src/test/auxiliary/crateresolve7x.rs b/src/test/auxiliary/crateresolve7x.rs
index 5b024479930..456f40b2231 100644
--- a/src/test/auxiliary/crateresolve7x.rs
+++ b/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() }
 }
diff --git a/src/test/run-pass/crateresolve7.rs b/src/test/run-pass/crateresolve7.rs
index 7be57dbaacd..009e0d7d356 100644
--- a/src/test/run-pass/crateresolve7.rs
+++ b/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;