Add tests for symlinks to git submodules or directories.

Author: thomwiggers

tests/testsuite/package.rs

@@ -504,6 +504,37 @@ fn package_git_submodule() {
         .run();
 }
 
+#[cargo_test]
+fn package_symlink_to_submodule() {
+    let project = git::new("foo", |project| {
+        project
+            .file("src/lib.rs", "pub fn foo() {}")
+            .symlink("submodule", "submodule-link")
+        }).unwrap();
+
+    let library = git::new("submodule", |library| {
+        library.no_manifest().file("Makefile", "all:")
+    }).unwrap();
+
+    let repository = git2::Repository::open(&project.root()).unwrap();
+    let url = path2url(library.root()).to_string();
+    git::add_submodule(&repository, &url, Path::new("submodule"));
+    git::commit(&repository);
+
+    let repository = git2::Repository::open(&project.root().join("submodule")).unwrap();
+    repository
+        .reset(
+            &repository.revparse_single("HEAD").unwrap(),
+            git2::ResetType::Hard,
+            None
+        ).unwrap();
+
+    project
+        .cargo("package --no-verify -v")
+        .with_stderr_contains("[ARCHIVING] submodule/Makefile")
+        .run();
+}
+
 #[cargo_test]
 fn no_duplicates_from_modified_tracked_files() {
     let root = paths::root().join("all");
@@ -699,6 +730,18 @@ Caused by:
         .run();
 }
 
+#[cargo_test]
+fn package_symlink_to_dir() {
+    project()
+        .file("src/main.rs", r#"fn main() { println!("hello"); }"#)
+        .file("bla/Makefile", "all:")
+        .symlink_dir("bla", "foo")
+        .build()
+        .cargo("package -v")
+        .with_stderr_contains("[ARCHIVING] foo/Makefile")
+        .run();
+}
+
 #[cargo_test]
 fn do_not_package_if_repository_is_dirty() {
     let p = project().build();

tests/testsuite/support/mod.rs

@@ -178,11 +178,16 @@ impl FileBuilder {
 struct SymlinkBuilder {
     dst: PathBuf,
     src: PathBuf,
+    src_is_dir: bool,
 }
 
 impl SymlinkBuilder {
     pub fn new(dst: PathBuf, src: PathBuf) -> SymlinkBuilder {
-        SymlinkBuilder { dst, src }
+        SymlinkBuilder { dst, src, src_is_dir: false }
+    }
+
+    pub fn new_dir(dst: PathBuf, src: PathBuf) -> SymlinkBuilder {
+        SymlinkBuilder { dst, src, src_is_dir: true }
     }
 
     #[cfg(unix)]
@@ -194,7 +199,11 @@ impl SymlinkBuilder {
     #[cfg(windows)]
     fn mk(&self) {
         self.dirname().mkdir_p();
-        t!(os::windows::fs::symlink_file(&self.dst, &self.src));
+        if self.src_is_dir {
+            t!(os::window::fs::symlink_dir(&self.dst, &self.src));
+        } else {
+            t!(os::windows::fs::symlink_file(&self.dst, &self.src));
+        }
     }
 
     fn dirname(&self) -> &Path {
@@ -261,6 +270,14 @@ impl ProjectBuilder {
         self
     }
 
+    pub fn symlink_dir<T: AsRef<Path>>(mut self, dst: T, src: T) -> Self {
+        self.symlinks.push(SymlinkBuilder::new_dir(
+                self.root.root().join(dst),
+                self.root.root().join(src),
+            ));
+        self
+    }
+
     pub fn no_manifest(mut self) -> Self {
         self.no_manifest = true;
         self