diff options
| author |  ajmichael <ajmichael@google.com> | 2017-12-06 08:13:50 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-06 08:15:59 -0800 |
| commit | 68c577afc2fb33b5e66b820bcc9043fed1071456 (patch) | |
| tree | ec2e167a764e45e94f03e9d4f5b3c9dff57bb426 /tools/test | |
| parent | 16059b32418215c4828fe98a0d90527d535c4fc9 (diff) | |
Fix some broken targets and failing tests.
RELNOTES: None
PiperOrigin-RevId: 178099410
Diffstat (limited to 'tools/test')
| -rw-r--r-- | tools/test/BUILD | 1 | ||||
| -rw-r--r-- | tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/test/BUILD b/tools/test/BUILD index 6fc7bbdc94..5b9dd5e5af 100644 --- a/tools/test/BUILD +++ b/tools/test/BUILD @@ -24,6 +24,7 @@ java_test( deps = [ ":LcovMergerTestUtils", "//src/main/java/com/google/devtools/build/lib/vfs", + "//src/test/java/com/google/devtools/build/lib:foundations_testutil", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:junit4", "//third_party:truth", diff --git a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java index f34e374f0a..8460b7eb5c 100644 --- a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java +++ b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.testutil.Scratch; import com.google.devtools.build.lib.vfs.FileSystemUtils; -import com.google.devtools.build.lib.vfs.FileSystems; +import com.google.devtools.build.lib.vfs.util.FileSystems; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -33,7 +33,7 @@ import org.junit.runners.JUnit4; public class LcovMergerTest { private final Scratch scratch = - new Scratch(FileSystemUtils.getWorkingDirectory(FileSystems.initDefaultAsJavaIo())); + new Scratch(FileSystemUtils.getWorkingDirectory(FileSystems.getJavaIoFileSystem())); @Test public void testZeroDatFile() throws IOException { |