Fix tests and have rustpkg inject pkgid instead of link meta.

rust-lang · Nov 25, 2013 · 003c35e · 003c35e
1 parent 7408c14
commit 003c35e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 83 deletions.
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
@@ -290,23 +290,16 @@ pub fn compile_input(context: &BuildContext,
                                       addl_lib_search_paths.insert(p);
                                   });
 
-    // Inject the link attributes so we get the right package name and version
-    if attr::find_linkage_metas(crate.attrs).is_empty() {
-        let name_to_use = match what {
-            Test  => format!("{}test", pkg_id.short_name).to_managed(),
-            Bench => format!("{}bench", pkg_id.short_name).to_managed(),
-            _     => pkg_id.short_name.to_managed()
-        };
-        debug!("Injecting link name: {}", name_to_use);
+    // Inject the pkgid attribute so we get the right package name and version
+
+    if !attr::contains_name(crate.attrs, "pkgid") {
         // FIXME (#9639): This needs to handle non-utf8 paths
-        let link_options =
-            ~[attr::mk_name_value_item_str(@"name", name_to_use),
-              attr::mk_name_value_item_str(@"vers", pkg_id.version.to_str().to_managed())] +
-            ~[attr::mk_name_value_item_str(@"package_id",
-                                           pkg_id.path.as_str().unwrap().to_managed())];
-
-        debug!("link options: {:?}", link_options);
-        crate.attrs = ~[attr::mk_attr(attr::mk_list_item(@"link", link_options))];
+        let pkgid_attr =
+            attr::mk_name_value_item_str(@"pkgid",
+                                         pkg_id.path.as_str().unwrap().to_managed());
+
+        debug!("pkgid attr: {:?}", pkgid_attr);
+        crate.attrs = ~[attr::mk_attr(pkgid_attr)];
     }
 
     debug!("calling compile_crate_from_input, workspace = {},

diff --git a/src/test/compile-fail/dup-link-name.rs b/src/test/compile-fail/dup-link-name.rs
diff --git a/src/test/run-pass/crateresolve6.rs b/src/test/run-pass/crateresolve6.rs
diff --git a/src/test/run-pass/crateresolve7.rs b/src/test/run-pass/crateresolve7.rs
diff --git a/src/test/run-pass/crateresolve8.rs b/src/test/run-pass/crateresolve8.rs
@@ -13,7 +13,7 @@
 
 #[pkgid="crateresolve8#0.1"];
 
-extern mod crateresolve8(vers = "0.1", package_id="crateresolve8");
+extern mod crateresolve8(vers = "0.1", package_id="crateresolve8#0.1");
 //extern mod crateresolve8(vers = "0.1");
 
 pub fn main() {

diff --git a/src/test/run-pass/issue-6919.rs b/src/test/run-pass/issue-6919.rs
@@ -13,9 +13,9 @@
 
 #[pkgid="issue-6919"];
 
-extern mod iss ( name = "iss6919_3" );
+extern mod issue6919_3;
 
 pub fn main() {
-    iss::D.k;
+    issue6919_3::D.k;
 }