Fix a bug in MockToolsConfig#copyTool that causes an extra line to …

…be written. PiperOrigin-RevId: 435111464
bazelbuild · Mar 16, 2022 · bd35a08 · bd35a08
1 parent 353ea10
commit bd35a08
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java
@@ -20,7 +20,6 @@
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.util.FileSystems;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import javax.annotation.Nullable;
 
 /**
@@ -160,7 +159,7 @@ public void copyTool(String relativePath) throws IOException {
   public void copyTool(String relativePath, String dest) throws IOException {
     Path runfiles = FileSystems.getNativeFileSystem().getPath(BlazeTestUtils.runfilesDir());
     Path source = runfiles.getRelative(TestConstants.WORKSPACE_NAME).getRelative(relativePath);
-    create(dest, FileSystemUtils.readContent(source, StandardCharsets.ISO_8859_1));
+    create(dest, FileSystemUtils.readLinesAsLatin1(source).toArray(String[]::new));
   }
 
   /**