Add Path argument to supportsModifications, supports*LinksNatively.

This works better with UnionFileSystem, as (eg.) different mapped file systems might not agree on whether they are read-only.

No actual code changes have been made that actually uses this argument, so this should be a behaviour no-op.

PiperOrigin-RevId: 172782759

1 files changed, 13 insertions, 13 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
index 82f8d727aa..d62bc66406 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/SymlinkAwareFileSystemTest.java
@@ -78,7 +78,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
     assertThat(linkPath.isDirectory(Symlinks.NOFOLLOW)).isFalse();
     assertThat(linkPath.isDirectory(Symlinks.FOLLOW)).isFalse();
 
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(linkPath)) {
       assertThat(linkPath.getFileSize(Symlinks.NOFOLLOW)).isEqualTo(newPath.toString().length());
       assertThat(linkPath.getFileSize()).isEqualTo(newPath.getFileSize(Symlinks.NOFOLLOW));
     }
@@ -196,7 +196,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
       PathFragment relative = PathFragment.create(linkTarget);
       linkPath.delete();
       createSymbolicLink(linkPath, relative);
-      if (supportsSymlinks) {
+      if (testFS.supportsSymbolicLinksNatively(linkPath)) {
         assertThat(linkPath.getFileSize(Symlinks.NOFOLLOW)).isEqualTo(linkTarget.length());
         assertThat(linkPath.readSymbolicLink()).isEqualTo(relative);
       }
@@ -258,7 +258,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
     Path link = absolutize("recursive-link");
     createSymbolicLink(link, link);
 
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(link)) {
       try {
         link.resolveSymbolicLinks();
         fail();
@@ -275,7 +275,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
     createSymbolicLink(link2, link1);
     createSymbolicLink(link1, link2);
 
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(link1)) {
       try {
         link1.resolveSymbolicLinks();
         fail();
@@ -287,7 +287,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
 
   @Test
   public void testResolveSymbolicLinksENOENT() {
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(xDanglingLink)) {
       try {
         xDanglingLink.resolveSymbolicLinks();
         fail();
@@ -299,9 +299,9 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
 
   @Test
   public void testResolveSymbolicLinksENOTDIR() throws IOException {
-    if (supportsSymlinks) {
-      Path badLinkTarget = xFile.getChild("bad"); // parent is not a directory!
-      Path badLink = absolutize("badLink");
+    Path badLinkTarget = xFile.getChild("bad"); // parent is not a directory!
+    Path badLink = absolutize("badLink");
+    if (testFS.supportsSymbolicLinksNatively(badLink)) {
       createSymbolicLink(badLink, badLinkTarget);
       try {
         badLink.resolveSymbolicLinks();
@@ -316,7 +316,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
 
   @Test
   public void testResolveSymbolicLinksWithUplevelRefs() throws IOException {
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(xLinkToFile)) {
       // Create a series of links that refer to xFile as ./xFile,
       // ./../foo/xFile, ./../../bar/foo/xFile, etc.  They should all resolve
       // to xFile.
@@ -334,7 +334,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
 
   @Test
   public void testReadSymbolicLink() throws IOException {
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(xDanglingLink)) {
       assertThat(xDanglingLink.readSymbolicLink().toString()).isEqualTo(xNothing.toString());
     }
 
@@ -363,7 +363,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
       throws IOException {
     xEmptyDirectory.setWritable(false);
     Path xChildOfReadonlyDir = xEmptyDirectory.getChild("x");
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(xChildOfReadonlyDir)) {
       try {
         xChildOfReadonlyDir.createSymbolicLink(xNothing);
         fail();
@@ -385,7 +385,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
     assertThat(someLink.isSymbolicLink()).isTrue();
     assertThat(someLink.exists(Symlinks.NOFOLLOW)).isTrue(); // the link itself exists
     assertThat(someLink.exists()).isFalse(); // ...but the referent doesn't
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(someLink)) {
       try {
         someLink.resolveSymbolicLinks();
       } catch (FileNotFoundException e) {
@@ -397,7 +397,7 @@ public abstract class SymlinkAwareFileSystemTest extends FileSystemTest {
   @Test
   public void testCannotCreateSymbolicLinkWithoutParent() throws IOException {
     Path xChildOfMissingDir = xNothing.getChild("x");
-    if (supportsSymlinks) {
+    if (testFS.supportsSymbolicLinksNatively(xChildOfMissingDir)) {
       try {
         xChildOfMissingDir.createSymbolicLink(xFile);
         fail();