diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2016-09-28 15:02:13 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-09-28 16:06:31 +0000 |
| commit | 8896dad21f6993d4b9fd74d3a332143e75080d06 (patch) | |
| tree | 04b4f5fddeeaf96feecd04421328f9980437ee81 /src/test | |
| parent | ad1a77e296fe5f05624109f3af04c5bc3257e9b6 (diff) | |
Windows, native: add windows_msvc config_setting
Update `select` statements in BUILD files with the
new config_setting.
This is a first step on a long path that leads to
us being able to compile bazel on Windows with
--cpu=x64_windows_msvc. Needless to say, we're not
there yet.
Tested: on Linux, Darwin, Windows/MSYS
--
MOS_MIGRATED_REVID=134534613
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/repository/BUILD | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index c676d7d49a..67efd8385e 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -78,6 +78,7 @@ java_library( ]), data = select({ "//src:windows": [], + "//src:windows_msvc": [], "//conditions:default": [ "//src/main/native:libunix.dylib", "//src/main/native:libunix.so", @@ -211,6 +212,7 @@ java_test( ":MockSubprocess_deploy.jar", ] + select({ "//src:windows": ["//src/main/native:windows_jni.dll"], + "//src:windows_msvc": ["//src/main/native:windows_jni.dll"], "//conditions:default": [ "//src/main/native:libunix.dylib", "//src/main/native:libunix.so", diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD index 9086a6be91..530fd558ba 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD @@ -7,13 +7,9 @@ filegroup( java_test( name = "RepositoryTests", srcs = select({ - "//src:windows": glob( - ["*.java"], - exclude = ["CompressedTarFunctionTest.java"], - ), - "//conditions:default": glob( - ["*.java"], - ), + "//src:windows": [":RepositoryTests_windows_srcs"], + "//src:windows_msvc": [":RepositoryTests_windows_srcs"], + "//conditions:default": glob(["*.java"]), }), data = ["test_decompress_archive.tar.gz"], tags = ["rules"], @@ -42,3 +38,11 @@ java_test( "//third_party/protobuf", ], ) + +filegroup( + name = "RepositoryTests_windows_srcs", + srcs = glob( + ["*.java"], + exclude = ["CompressedTarFunctionTest.java"], + ), +) |