test: Refactor the crateresolve tests

Keep their aux builds from stomping on each other

12 files changed, 63 insertions, 31 deletions

diff --git a/src/test/auxiliary/crateresolve-1.rs b/src/test/auxiliary/crateresolve1-1.rs
index 70651951f3e..a91eda15740 100644
--- a/src/test/auxiliary/crateresolve-1.rs
+++ b/src/test/auxiliary/crateresolve1-1.rs
@@ -1,4 +1,4 @@
-#[link(name = "crateresolve",
+#[link(name = "crateresolve1",
        vers = "0.1")];
 
 #[crate_type = "lib"];
diff --git a/src/test/auxiliary/crateresolve-2.rs b/src/test/auxiliary/crateresolve1-2.rs
index aeee7169793..053745deff6 100644
--- a/src/test/auxiliary/crateresolve-2.rs
+++ b/src/test/auxiliary/crateresolve1-2.rs
@@ -1,4 +1,4 @@
-#[link(name = "crateresolve",
+#[link(name = "crateresolve1",
        vers = "0.2")];
 
 #[crate_type = "lib"];
diff --git a/src/test/auxiliary/crateresolve-3.rs b/src/test/auxiliary/crateresolve1-3.rs
index 2c38cbc8a9c..78d2a64087c 100644
--- a/src/test/auxiliary/crateresolve-3.rs
+++ b/src/test/auxiliary/crateresolve1-3.rs
@@ -1,4 +1,4 @@
-#[link(name = "crateresolve",
+#[link(name = "crateresolve1",
        vers = "0.3")];
 
 #[crate_type = "lib"];
diff --git a/src/test/auxiliary/crateresolve2-1.rs b/src/test/auxiliary/crateresolve2-1.rs
new file mode 100644
index 00000000000..2dabc245509
--- /dev/null
+++ b/src/test/auxiliary/crateresolve2-1.rs
@@ -0,0 +1,6 @@
+#[link(name = "crateresolve2",
+       vers = "0.1")];
+
+#[crate_type = "lib"];
+
+fn f() -> int { 10 }
diff --git a/src/test/auxiliary/crateresolve2-2.rs b/src/test/auxiliary/crateresolve2-2.rs
new file mode 100644
index 00000000000..83abb615522
--- /dev/null
+++ b/src/test/auxiliary/crateresolve2-2.rs
@@ -0,0 +1,6 @@
+#[link(name = "crateresolve2",
+       vers = "0.2")];
+
+#[crate_type = "lib"];
+
+fn f() -> int { 20 }
diff --git a/src/test/auxiliary/crateresolve2-3.rs b/src/test/auxiliary/crateresolve2-3.rs
new file mode 100644
index 00000000000..52c746f1391
--- /dev/null
+++ b/src/test/auxiliary/crateresolve2-3.rs
@@ -0,0 +1,6 @@
+#[link(name = "crateresolve2",
+       vers = "0.3")];
+
+#[crate_type = "lib"];
+
+fn f() -> int { 30 }
diff --git a/src/test/compile-fail/crateresolve.rs b/src/test/compile-fail/crateresolve.rs
deleted file mode 100644
index da1969a8a03..00000000000
--- a/src/test/compile-fail/crateresolve.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// aux-build:crateresolve-1.rs
-// aux-build:crateresolve-2.rs
-// aux-build:crateresolve-3.rs
-// error-pattern:multiple matching crates for `crateresolve`
-
-use crateresolve;
-
-fn main() {
-}
diff --git a/src/test/compile-fail/crateresolve1.rs b/src/test/compile-fail/crateresolve1.rs
new file mode 100644
index 00000000000..278d86c8923
--- /dev/null
+++ b/src/test/compile-fail/crateresolve1.rs
@@ -0,0 +1,9 @@
+// aux-build:crateresolve1-1.rs
+// aux-build:crateresolve1-2.rs
+// aux-build:crateresolve1-3.rs
+// error-pattern:multiple matching crates for `crateresolve1`
+
+use crateresolve1;
+
+fn main() {
+}
diff --git a/src/test/compile-fail/crateresolve2.rs b/src/test/compile-fail/crateresolve2.rs
new file mode 100644
index 00000000000..e2d49b5f05a
--- /dev/null
+++ b/src/test/compile-fail/crateresolve2.rs
@@ -0,0 +1,14 @@
+// aux-build:crateresolve2-1.rs
+// aux-build:crateresolve2-2.rs
+// aux-build:crateresolve2-3.rs
+// error-pattern:using multiple versions of crate `crateresolve2`
+
+use crateresolve2(vers = "0.1");
+
+mod m {
+    use crateresolve2(vers = "0.2");
+}
+
+fn main() {
+    let x: int = false;
+}
diff --git a/src/test/run-pass/crateresolve.rs b/src/test/run-pass/crateresolve.rs
deleted file mode 100644
index 4eda67eebec..00000000000
--- a/src/test/run-pass/crateresolve.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// xfail-fast
-// aux-build:crateresolve-1.rs
-// aux-build:crateresolve-2.rs
-// aux-build:crateresolve-3.rs
-
-use crateresolve(vers = "0.2");
-
-fn main() {
-    assert crateresolve::f() == 20;
-}
diff --git a/src/test/run-pass/crateresolve1.rs b/src/test/run-pass/crateresolve1.rs
new file mode 100644
index 00000000000..3dd020647e7
--- /dev/null
+++ b/src/test/run-pass/crateresolve1.rs
@@ -0,0 +1,10 @@
+// xfail-fast
+// aux-build:crateresolve1-1.rs
+// aux-build:crateresolve1-2.rs
+// aux-build:crateresolve1-3.rs
+
+use crateresolve1(vers = "0.2");
+
+fn main() {
+    assert crateresolve1::f() == 20;
+}
diff --git a/src/test/run-pass/crateresolve2.rs b/src/test/run-pass/crateresolve2.rs
index de1852a5f97..5820f5985df 100644
--- a/src/test/run-pass/crateresolve2.rs
+++ b/src/test/run-pass/crateresolve2.rs
@@ -1,22 +1,22 @@
 // xfail-fast
 // xfail-test
-// aux-build:crateresolve-1.rs
-// aux-build:crateresolve-2.rs
-// aux-build:crateresolve-3.rs
+// aux-build:crateresolve2-1.rs
+// aux-build:crateresolve2-2.rs
+// aux-build:crateresolve2-3.rs
 
 mod a {
-    use crateresolve(vers = "0.1");
-    fn f() { assert crateresolve::f() == 10; }
+    use crateresolve2(vers = "0.1");
+    fn f() { assert crateresolve2::f() == 10; }
 }
 
 mod b {
-    use crateresolve(vers = "0.2");
-    fn f() { assert crateresolve::f() == 20; }
+    use crateresolve2(vers = "0.2");
+    fn f() { assert crateresolve2::f() == 20; }
 }
 
 mod c {
-    use crateresolve(vers = "0.3");
-    fn f() { assert crateresolve::f() == 30; }
+    use crateresolve2(vers = "0.3");
+    fn f() { assert crateresolve2::f() == 30; }
 }
 
 fn main() {