commit 0ad729f79213e7d0d80260c092b557751d757b6b
author Laszlo Csomor <laszlocsomor@google.com> Wed Dec 02 15:20:35 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Wed Dec 02 22:26:34 2015 +0000
tree fdec4af039557e71173376bacccfcf3c6932c1b8
parent 07b0ba6079022d9a9643d46b28aa4d2a75334b35

Fix a bug in the Google-internal rule "Fileset" (not in Bazel).

--
MOS_MIGRATED_REVID=109195426

src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
index f8f0a45..40405fe 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
@@ -611,6 +611,33 @@
     assertSymlinksInOrder(params); // expect empty results
   }
 
+  private void assertExclusionOfDanglingSymlink(SymlinkBehavior symlinkBehavior) throws Exception {
+    Artifact linkName = getSourceArtifact("foo/dangling.sym");
+    Artifact buildFile = getSourceArtifact("foo/BUILD");
+    RootedPath linkTarget = createFile(siblingOf(linkName, "target.file"), "blah");
+    linkName.getPath().createSymbolicLink(new PathFragment("target.file"));
+    createFile(buildFile);
+    linkTarget.asPath().delete();
+
+    FilesetTraversalParams paramsWithSymlinkCopy =
+        FilesetTraversalParamsFactory.recursiveTraversalOfPackage(
+            /* ownerLabel */ label("//foo"),
+            /* buildFile */ buildFile,
+            /* destPath */ new PathFragment("output-name"),
+            /* excludes */ ImmutableSet.of("dangling.sym"),
+            /* symlinkBehaviorMode */ symlinkBehavior,
+            /* pkgBoundaryMode */ PackageBoundaryMode.DONT_CROSS);
+    assertSymlinksInOrder(paramsWithSymlinkCopy, symlink("output-name/BUILD", buildFile));
+  }
+
+  public void testExclusionOfDanglingSymlinkWithSymlinkModeCopy() throws Exception {
+    assertExclusionOfDanglingSymlink(SymlinkBehavior.COPY);
+  }
+
+  public void testExclusionOfDanglingSymlinkWithSymlinkModeDereference() throws Exception {
+    assertExclusionOfDanglingSymlink(SymlinkBehavior.DEREFERENCE);
+  }
+
   public void testFileTraversalForNonExistentFile() throws Exception {
     Artifact path = getSourceArtifact("foo/non-existent");
     FilesetTraversalParams params =