test: Remove duplicated auxliary tests

Author: lht

src/test/auxiliary/crateresolve7-1.rs

@@ -1,14 +1,14 @@
 // xfail-fast
-// aux-build:crateresolve7-1.rs
-// aux-build:crateresolve7-2.rs
+// aux-build:crateresolve_calories-1.rs
+// aux-build:crateresolve_calories-2.rs
 
 // These both have the same version but differ in other metadata
 mod a {
-    use cr7_1 (name = "crateresolve7", vers = "0.1", calories="100");
-    fn f() -> int { cr7_1::f() }
+    use cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
+    fn f() -> int { cr_1::f() }
 }
 
 mod b {
-    use cr7_2 (name = "crateresolve7", vers = "0.1", calories="200");
-    fn f() -> int { cr7_2::f() }
+    use cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
+    fn f() -> int { cr_2::f() }
 }

src/test/auxiliary/crateresolve7-2.rs

@@ -1,4 +1,4 @@
-#[link(name = "crateresolve6",
+#[link(name = "crateresolve_calories",
        vers = "0.1",
        calories = "100")];
 

src/test/auxiliary/crateresolve7x.rs

@@ -1,4 +1,4 @@
-#[link(name = "crateresolve6",
+#[link(name = "crateresolve_calories",
        vers = "0.1",
        calories = "200")];
 

src/test/auxiliary/crateresolve6-1.rs renamed to src/test/auxiliary/crateresolve_calories-1.rs

@@ -1,11 +1,11 @@
 // xfail-fast
-// aux-build:crateresolve6-1.rs
-// aux-build:crateresolve6-2.rs
+// aux-build:crateresolve_calories-1.rs
+// aux-build:crateresolve_calories-2.rs
 // error-pattern:mismatched types
 
 // These both have the same version but differ in other metadata
-use cr6_1 (name = "crateresolve6", vers = "0.1", calories="100");
-use cr6_2 (name = "crateresolve6", vers = "0.1", calories="200");
+use cr6_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
+use cr6_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
 
 fn main() {
     assert cr6_1::f() == 100;

src/test/auxiliary/crateresolve6-2.rs renamed to src/test/auxiliary/crateresolve_calories-2.rs

@@ -1,6 +1,6 @@
 // xfail-fast
-// aux-build:crateresolve7-1.rs
-// aux-build:crateresolve7-2.rs
+// aux-build:crateresolve_calories-1.rs
+// aux-build:crateresolve_calories-2.rs
 // aux-build:crateresolve7x.rs
 
 use crateresolve7x;