diff options
author | tomlu <tomlu@google.com> | 2017-11-30 15:08:40 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-11-30 15:10:20 -0800 |
commit | 1a483d42df5bb42bcdc1f5f19662bcd1debd399d (patch) | |
tree | 8db9836b693464b9093359a5cf2d632aece8f0e8 /src/test | |
parent | b2d82018906b15cf979ea74444c55d828a5b6ca7 (diff) |
Move bazel conditions into src/conditions.
This will enable an easier transition from checked-in BUILD files to ones generated by copybara.
RELNOTES: None
PiperOrigin-RevId: 177514519
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/cpp/BUILD | 6 | ||||
-rw-r--r-- | src/test/cpp/util/BUILD | 36 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/android/junctions/BUILD | 12 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 6 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/repository/BUILD | 6 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/BUILD | 4 | ||||
-rw-r--r-- | src/test/native/BUILD | 12 | ||||
-rw-r--r-- | src/test/py/bazel/BUILD | 36 | ||||
-rw-r--r-- | src/test/shell/bazel/BUILD | 16 |
9 files changed, 67 insertions, 67 deletions
diff --git a/src/test/cpp/BUILD b/src/test/cpp/BUILD index 50054ad34d..1f58e4dc74 100644 --- a/src/test/cpp/BUILD +++ b/src/test/cpp/BUILD @@ -11,14 +11,14 @@ filegroup( cc_test( name = "blaze_util_test", srcs = select({ - "//src:windows": [ + "//src/conditions:windows": [ "blaze_util_windows_test.cc", ], - "//src:windows_msys": [ + "//src/conditions:windows_msys": [ "blaze_util_test.cc", "blaze_util_windows_test.cc", ], - "//src:windows_msvc": [ + "//src/conditions:windows_msvc": [ "blaze_util_windows_test.cc", ], "//conditions:default": [ diff --git a/src/test/cpp/util/BUILD b/src/test/cpp/util/BUILD index 791be74f4a..91b1ef0357 100644 --- a/src/test/cpp/util/BUILD +++ b/src/test/cpp/util/BUILD @@ -22,13 +22,13 @@ cc_test( name = "file_test", size = "small", srcs = ["file_test.cc"] + select({ - "//src:windows": [ + "//src/conditions:windows": [ "file_windows_test.cc", ], - "//src:windows_msys": [ + "//src/conditions:windows_msys": [ "file_windows_test.cc", ], - "//src:windows_msvc": [ + "//src/conditions:windows_msvc": [ "file_windows_test.cc", ], "//conditions:default": [ @@ -40,15 +40,15 @@ cc_test( "//src/main/cpp/util:file", "//third_party:gtest", ] + select({ - "//src:windows": [ + "//src/conditions:windows": [ ":windows_test_util", "//src/main/native/windows:lib-file", ], - "//src:windows_msys": [ + "//src/conditions:windows_msys": [ ":windows_test_util", "//src/main/native/windows:lib-file", ], - "//src:windows_msvc": [ + "//src/conditions:windows_msvc": [ ":windows_test_util", "//src/main/native/windows:lib-file", ], @@ -90,15 +90,15 @@ cc_library( name = "windows_test_util", testonly = 1, srcs = select({ - "//src:windows": ["windows_test_util.cc"], - "//src:windows_msys": ["windows_test_util.cc"], - "//src:windows_msvc": ["windows_test_util.cc"], + "//src/conditions:windows": ["windows_test_util.cc"], + "//src/conditions:windows_msys": ["windows_test_util.cc"], + "//src/conditions:windows_msvc": ["windows_test_util.cc"], "//conditions:default": [], }), hdrs = select({ - "//src:windows": ["windows_test_util.h"], - "//src:windows_msys": ["windows_test_util.h"], - "//src:windows_msvc": ["windows_test_util.h"], + "//src/conditions:windows": ["windows_test_util.h"], + "//src/conditions:windows_msys": ["windows_test_util.h"], + "//src/conditions:windows_msvc": ["windows_test_util.h"], "//conditions:default": [], }), visibility = [ @@ -111,21 +111,21 @@ cc_test( name = "windows_test_util_test", size = "small", srcs = select({ - "//src:windows": ["windows_test_util_test.cc"], - "//src:windows_msys": ["windows_test_util_test.cc"], - "//src:windows_msvc": ["windows_test_util_test.cc"], + "//src/conditions:windows": ["windows_test_util_test.cc"], + "//src/conditions:windows_msys": ["windows_test_util_test.cc"], + "//src/conditions:windows_msvc": ["windows_test_util_test.cc"], "//conditions:default": ["dummy_test.cc"], }), deps = select({ - "//src:windows": [ + "//src/conditions:windows": [ ":windows_test_util", "//third_party:gtest", ], - "//src:windows_msys": [ + "//src/conditions:windows_msys": [ ":windows_test_util", "//third_party:gtest", ], - "//src:windows_msvc": [ + "//src/conditions:windows_msvc": [ ":windows_test_util", "//third_party:gtest", ], diff --git a/src/test/java/com/google/devtools/build/android/junctions/BUILD b/src/test/java/com/google/devtools/build/android/junctions/BUILD index f3e00a37be..727dc02b70 100644 --- a/src/test/java/com/google/devtools/build/android/junctions/BUILD +++ b/src/test/java/com/google/devtools/build/android/junctions/BUILD @@ -14,15 +14,15 @@ java_test( name = "JunctionCreatorTest", size = "small", srcs = select({ - "//src:windows": ["WindowsJunctionCreatorTest.java"], - "//src:windows_msvc": ["WindowsJunctionCreatorTest.java"], - "//src:windows_msys": ["WindowsJunctionCreatorTest.java"], + "//src/conditions:windows": ["WindowsJunctionCreatorTest.java"], + "//src/conditions:windows_msvc": ["WindowsJunctionCreatorTest.java"], + "//src/conditions:windows_msys": ["WindowsJunctionCreatorTest.java"], "//conditions:default": ["NoopJunctionCreatorTest.java"], }), test_class = select({ - "//src:windows": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest", - "//src:windows_msvc": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest", - "//src:windows_msys": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest", + "//src/conditions:windows": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest", + "//src/conditions:windows_msvc": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest", + "//src/conditions:windows_msys": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest", "//conditions:default": "com.google.devtools.build.android.junctions.NoopJunctionCreatorTest", }), deps = [ diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 4cb175a461..c511698e3b 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -22,9 +22,9 @@ WINDOWS_ON_WINDOWS_TESTS = glob( ALL_WINDOWS_TESTS = CROSS_PLATFORM_WINDOWS_TESTS + WINDOWS_ON_WINDOWS_TESTS JNI_LIB = select({ - "//src:windows": ["//src/main/native/windows:windows_jni.dll"], - "//src:windows_msys": ["//src/main/native/windows:windows_jni.dll"], - "//src:windows_msvc": ["//src/main/native/windows:windows_jni.dll"], + "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"], + "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"], + "//src/conditions:windows_msvc": ["//src/main/native/windows: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 ab293444dc..8c7437ee3b 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 @@ -13,9 +13,9 @@ filegroup( java_test( name = "RepositoryTests", srcs = select({ - "//src:windows": [":RepositoryTests_windows_srcs"], - "//src:windows_msys": [":RepositoryTests_windows_srcs"], - "//src:windows_msvc": [":RepositoryTests_windows_srcs"], + "//src/conditions:windows": [":RepositoryTests_windows_srcs"], + "//src/conditions:windows_msys": [":RepositoryTests_windows_srcs"], + "//src/conditions:windows_msvc": [":RepositoryTests_windows_srcs"], "//conditions:default": glob(["*.java"]), }), data = ["test_decompress_archive.tar.gz"], diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD index 4fbd825c10..a92f87161b 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD @@ -50,8 +50,8 @@ java_library( java_test( name = "SkyframeTests", srcs = select({ - "//src:darwin": glob(["*.java"]), - "//src:darwin_x86_64": glob(["*.java"]), + "//src/conditions:darwin": glob(["*.java"]), + "//src/conditions:darwin_x86_64": glob(["*.java"]), "//conditions:default": glob( ["*.java"], exclude = ["MacOSXFsEventsDiffAwarenessTest.java"], diff --git a/src/test/native/BUILD b/src/test/native/BUILD index 38bb9921e1..3934fd5e1f 100644 --- a/src/test/native/BUILD +++ b/src/test/native/BUILD @@ -12,32 +12,32 @@ cc_test( name = "windows_jni_test", size = "small", srcs = select({ - "//src:windows": [ + "//src/conditions:windows": [ "windows/util_test.cc", "windows/file_test.cc", ], - "//src:windows_msys": [ + "//src/conditions:windows_msys": [ "windows/util_test.cc", "windows/file_test.cc", ], - "//src:windows_msvc": [ + "//src/conditions:windows_msvc": [ "windows/util_test.cc", "windows/file_test.cc", ], "//conditions:default": ["dummy_test.cc"], }), deps = select({ - "//src:windows": [ + "//src/conditions:windows": [ "//src/main/native/windows:lib-file", "//src/test/cpp/util:windows_test_util", "//third_party:gtest", ], - "//src:windows_msys": [ + "//src/conditions:windows_msys": [ "//src/main/native/windows:lib-file", "//src/test/cpp/util:windows_test_util", "//third_party:gtest", ], - "//src:windows_msvc": [ + "//src/conditions:windows_msvc": [ "//src/main/native/windows:lib-file", "//src/test/cpp/util:windows_test_util", "//third_party:gtest", diff --git a/src/test/py/bazel/BUILD b/src/test/py/bazel/BUILD index 98b20ca01b..47c63de1c8 100644 --- a/src/test/py/bazel/BUILD +++ b/src/test/py/bazel/BUILD @@ -57,21 +57,21 @@ py_test( name = "bazel_windows_test", size = "medium", srcs = select({ - "//src:windows": ["bazel_windows_test.py"], - "//src:windows_msvc": ["bazel_windows_test.py"], - "//src:windows_msys": ["bazel_windows_test.py"], + "//src/conditions:windows": ["bazel_windows_test.py"], + "//src/conditions:windows_msvc": ["bazel_windows_test.py"], + "//src/conditions:windows_msys": ["bazel_windows_test.py"], "//conditions:default": ["empty_test.py"], }), main = select({ - "//src:windows": "bazel_windows_test.py", - "//src:windows_msvc": "bazel_windows_test.py", - "//src:windows_msys": "bazel_windows_test.py", + "//src/conditions:windows": "bazel_windows_test.py", + "//src/conditions:windows_msvc": "bazel_windows_test.py", + "//src/conditions:windows_msys": "bazel_windows_test.py", "//conditions:default": "empty_test.py", }), deps = select({ - "//src:windows": [":test_base"], - "//src:windows_msvc": [":test_base"], - "//src:windows_msys": [":test_base"], + "//src/conditions:windows": [":test_base"], + "//src/conditions:windows_msvc": [":test_base"], + "//src/conditions:windows_msys": [":test_base"], "//conditions:default": [], }), ) @@ -87,21 +87,21 @@ py_test( name = "bazel_windows_cpp_test", size = "large", srcs = select({ - "//src:windows": ["bazel_windows_cpp_test.py"], - "//src:windows_msvc": ["bazel_windows_cpp_test.py"], - "//src:windows_msys": ["bazel_windows_cpp_test.py"], + "//src/conditions:windows": ["bazel_windows_cpp_test.py"], + "//src/conditions:windows_msvc": ["bazel_windows_cpp_test.py"], + "//src/conditions:windows_msys": ["bazel_windows_cpp_test.py"], "//conditions:default": ["empty_test.py"], }), main = select({ - "//src:windows": "bazel_windows_cpp_test.py", - "//src:windows_msvc": "bazel_windows_cpp_test.py", - "//src:windows_msys": "bazel_windows_cpp_test.py", + "//src/conditions:windows": "bazel_windows_cpp_test.py", + "//src/conditions:windows_msvc": "bazel_windows_cpp_test.py", + "//src/conditions:windows_msys": "bazel_windows_cpp_test.py", "//conditions:default": "empty_test.py", }), deps = select({ - "//src:windows": [":test_base"], - "//src:windows_msvc": [":test_base"], - "//src:windows_msys": [":test_base"], + "//src/conditions:windows": [":test_base"], + "//src/conditions:windows_msvc": [":test_base"], + "//src/conditions:windows_msys": [":test_base"], "//conditions:default": [], }), ) diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 855bba1cbd..71b103e510 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -47,9 +47,9 @@ filegroup( ] + select({ # TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/2241 # is resolved, use cc implementation of singlejar on windows - "//src:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], - "//src:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], - "//src:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src/conditions:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src/conditions:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src/conditions:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], "//conditions:default": ["//src/tools/singlejar:singlejar"], }), visibility = [ @@ -175,11 +175,11 @@ sh_test( size = "medium", srcs = ["bazel_toolchain_test.sh"], data = [":test-deps"] + select({ - "//src:darwin": [], - "//src:darwin_x86_64": [], - "//src:windows": [], - "//src:windows_msys": [], - "//src:windows_msvc": [], + "//src/conditions:darwin": [], + "//src/conditions:darwin_x86_64": [], + "//src/conditions:windows": [], + "//src/conditions:windows_msys": [], + "//src/conditions:windows_msvc": [], "//conditions:default": ["//src/test/shell/bazel/testdata:bazel_toolchain_test_project_pkg"], }), tags = [ |