From 0bef2142e869b0aa9360f383569dbfade44ba988 Mon Sep 17 00:00:00 2001 From: Philipp Wollermann Date: Fri, 21 Oct 2016 12:58:37 +0000 Subject: Use a select in the data attribute of bazel_toolchain_test to remove the Linaro compiler filegroup on macOS. This fixes the broken bazel_toolchain_test on macOS. I filed a bug to track the real issue (HardlinkedExecRoot sometimes seems to fail when inputs contain directories): https://github.com/bazelbuild/bazel/issues/1974 -- MOS_MIGRATED_REVID=136823559 --- src/test/shell/bazel/BUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/test') diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 3d70474b93..06d0032fcd 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -120,10 +120,13 @@ sh_test( name = "bazel_toolchain_test", size = "medium", srcs = ["bazel_toolchain_test.sh"], - data = [ - ":test-deps", - "//src/test/shell/bazel/testdata:bazel_toolchain_test_project_pkg", - ], + data = [":test-deps"] + select({ + "//src:darwin": [], + "//src:darwin_x86_64": [], + "//src:windows": [], + "//src:windows_msvc": [], + "//conditions:default": ["//src/test/shell/bazel/testdata:bazel_toolchain_test_project_pkg"], + }), tags = [ "requires-network", ], -- cgit v1.2.3