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 | |
parent | 16059b32418215c4828fe98a0d90527d535c4fc9 (diff) |
Fix some broken targets and failing tests.
RELNOTES: None
PiperOrigin-RevId: 178099410
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | src/tools/runfiles/runfiles_posix_test.sh | 0 | ||||
-rw-r--r-- | tools/build_defs/pkg/BUILD | 4 | ||||
-rw-r--r-- | tools/osx/xcode_version_flag.bzl | 2 | ||||
-rw-r--r-- | tools/test/BUILD | 1 | ||||
-rw-r--r-- | tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java | 4 |
6 files changed, 12 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index a34ea88256..21c6eb59d9 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -1,5 +1,8 @@ package( - default_visibility = ["//src/test/java/com/google/devtools/build/lib:__subpackages__"], + default_visibility = [ + "//src/test/java/com/google/devtools/build/lib:__subpackages__", + "//tools/test:__pkg__", + ], ) # Tests for Windows-specific functionality that can run cross-platform. diff --git a/src/tools/runfiles/runfiles_posix_test.sh b/src/tools/runfiles/runfiles_posix_test.sh index 794c5fe9de..794c5fe9de 100644..100755 --- a/src/tools/runfiles/runfiles_posix_test.sh +++ b/src/tools/runfiles/runfiles_posix_test.sh diff --git a/tools/build_defs/pkg/BUILD b/tools/build_defs/pkg/BUILD index 563eef8cef..2f55d7fd0e 100644 --- a/tools/build_defs/pkg/BUILD +++ b/tools/build_defs/pkg/BUILD @@ -32,6 +32,8 @@ py_test( ], data = [":archive_testdata"], srcs_version = "PY2AND3", + # archive.py requires xzcat, which is not available by default on Mac + tags = ["noci"], deps = [":archive"], ) @@ -216,6 +218,8 @@ sh_test( ":test-tar-xz.tar.xz", ":titi_test_all.changes", ], + # archive.py requires xzcat, which is not available by default on Mac + tags = ["noci"], deps = [ "//src/test/shell:bashunit", ], diff --git a/tools/osx/xcode_version_flag.bzl b/tools/osx/xcode_version_flag.bzl index 38d52445a6..4630e6e9e8 100644 --- a/tools/osx/xcode_version_flag.bzl +++ b/tools/osx/xcode_version_flag.bzl @@ -81,7 +81,7 @@ def _macos_sdk_version_flag_impl(ctx): return struct(providers = [ config_common.FeatureFlagInfo(value = _strip_version( xcode_config.sdk_version_for_platform( - apple_common.platform.macos_device)))]) + apple_common.platform.macos)))]) xcode_version_flag = rule( 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 { |