commit 8d24345cddc0632979f5153618b2254d5aac8357
author jmmv <jmmv@google.com> Tue Apr 09 09:41:21 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 09 09:43:08 2019 -0700
tree ebdb0b976a064a13c658208bde096f18208b84de
parent 1a70c27a9407e9ffa7844997e1a6032a8c4b2221

Remove dead code from NativePosixFiles and unix_jni.

RELNOTES: None.
PiperOrigin-RevId: 242683431

src/test/java/com/google/devtools/build/lib/unix/NativePosixFilesTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/unix/NativePosixFilesTest.java b/src/test/java/com/google/devtools/build/lib/unix/NativePosixFilesTest.java
index cca0b4b..3bcbd91 100644
--- a/src/test/java/com/google/devtools/build/lib/unix/NativePosixFilesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/unix/NativePosixFilesTest.java
@@ -106,7 +106,9 @@
   public void throwsFilePermissionException() throws Exception {
     File foo = new File("/bin");
     try {
-      NativePosixFiles.setWritable(foo);
+      NativePosixFiles.chmod(
+          foo.getPath(),
+          NativePosixFiles.lstat(foo.getPath()).getPermissions() | FileStatus.S_IWUSR);
       fail("Expected FilePermissionException or IOException, but wasn't thrown.");
     } catch (FilePermissionException e) {
       assertThat(e).hasMessageThat().isEqualTo(foo + " (Operation not permitted)");

src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index ad5feb9..7011dc1 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -22,6 +22,7 @@
 import com.google.common.io.BaseEncoding;
 import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.TestUtils;
+import com.google.devtools.build.lib.unix.FileStatus;
 import com.google.devtools.build.lib.unix.NativePosixFiles;
 import com.google.devtools.build.lib.util.Fingerprint;
 import java.io.File;
@@ -111,16 +112,8 @@
   protected abstract FileSystem getFreshFileSystem(DigestHashFunction digestHashFunction)
       throws IOException;
 
-  protected boolean isSymbolicLink(File file) {
-    return NativePosixFiles.isSymbolicLink(file);
-  }
-
-  protected void setWritable(File file) throws IOException {
-    NativePosixFiles.setWritable(file);
-  }
-
-  protected void setExecutable(File file) throws IOException {
-    NativePosixFiles.setExecutable(file);
+  protected boolean isSymbolicLink(File file) throws IOException {
+    return NativePosixFiles.lstat(file.getPath()).isSymbolicLink();
   }
 
   private static final Pattern STAT_SUBDIR_ERROR = Pattern.compile("(.*) \\(Not a directory\\)");
@@ -174,8 +167,11 @@
     }
     // Some tests set the directories read-only and/or non-executable, so
     // override that:
-    setWritable(directoryToRemove);
-    setExecutable(directoryToRemove);
+    NativePosixFiles.chmod(
+        directoryToRemove.getPath(),
+        NativePosixFiles.lstat(directoryToRemove.getPath()).getPermissions()
+            | FileStatus.S_IWUSR
+            | FileStatus.S_IXUSR);
 
     File[] files = directoryToRemove.listFiles();
     if (files != null) {
@@ -185,7 +181,10 @@
           removeEntireDirectory(currentFile);
         } else {
           if (!isSymbolicLink) {
-            setWritable(currentFile);
+            NativePosixFiles.chmod(
+                currentFile.getPath(),
+                NativePosixFiles.lstat(currentFile.getPath()).getPermissions()
+                    | FileStatus.S_IWUSR);
           }
           if (!currentFile.delete()) {
             throw new IOException("Failed to delete '" + currentFile + "'");