diff options
| author |  ajmichael <ajmichael@google.com> | 2017-09-25 11:19:42 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-09-25 12:02:54 -0400 |
| commit | f5e6969f8219fd76a0c67c6f8dbf705fb1d16529 (patch) | |
| tree | 609504d6376e76866849273c08887fec24ace096 /src/test/java/com/google/devtools/build/android | |
| parent | 77112c6ee7cc98e3e2732e54bee3f45efc5179bf (diff) | |
Change which tests should run on Windows
Set no_windows on all tests that have quoted jvm_flags. Remove no_windows from
some platform-independent unit tests.
Fixes https://github.com/bazelbuild/bazel/issues/3794
RELNOTES: None
PiperOrigin-RevId: 169909924
Diffstat (limited to 'src/test/java/com/google/devtools/build/android')
| -rw-r--r-- | src/test/java/com/google/devtools/build/android/desugar/BUILD | 10 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/android/desugar/BUILD b/src/test/java/com/google/devtools/build/android/desugar/BUILD index c5c29b7f6b..cb0c5ba9b5 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/BUILD +++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD @@ -363,7 +363,6 @@ java_test( name = "MethodInfoTest", size = "small", srcs = ["MethodInfoTest.java"], - tags = ["no_windows"], deps = [ "//src/tools/android/java/com/google/devtools/build/android/desugar", "//third_party:junit4", @@ -375,7 +374,6 @@ java_test( name = "FieldInfoTest", size = "small", srcs = ["FieldInfoTest.java"], - tags = ["no_windows"], deps = [ "//src/tools/android/java/com/google/devtools/build/android/desugar", "//third_party:junit4", @@ -387,7 +385,6 @@ java_test( name = "Java7CompatibilityTest", size = "small", srcs = ["Java7CompatibilityTest.java"], - tags = ["no_windows"], deps = [ "//src/tools/android/java/com/google/devtools/build/android/desugar", "//third_party:asm", @@ -400,7 +397,6 @@ java_test( name = "IndexedInputsTest", size = "small", srcs = ["IndexedInputsTest.java"], - tags = ["no_windows"], deps = [ "//src/tools/android/java/com/google/devtools/build/android/desugar", "//third_party:guava", @@ -419,6 +415,7 @@ java_test( "-Dfortest.simulated.android.sdk_int=19", "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$ReuseDesugaringStrategy'", ], + tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.TryWithResourcesRewriterTest", deps = [ ":mocked_android_os_sdk_for_testing", @@ -443,6 +440,7 @@ java_test( "-Dfortest.simulated.android.sdk_int=18", "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$MimicDesugaringStrategy'", ], + tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.TryWithResourcesRewriterTest", deps = [ ":mocked_android_os_sdk_for_testing", @@ -486,7 +484,7 @@ java_test( # This test sets the lambda dump directory via the system property in the command line # (i.e., jvm_flags). So the dump directory is expected to succeed. java_test( - name = "DesugarMainCLassTestLambdaDirectoryCorrectlySet", + name = "DesugarMainClassTestLambdaDirectoryCorrectlySet", size = "small", srcs = ["DesugarMainClassTest.java"], jvm_flags = ["-Djdk.internal.lambda.dumpProxyClasses=$$(mktemp -d)"], @@ -503,7 +501,7 @@ java_test( # Different from the test target above, this test does not set the lambda dump directory in the # command line. Instead, it sets the system property in the test code, which is expected to fail. java_test( - name = "DesugarMainCLassTestLambdaDirectoryIncorrectlySet", + name = "DesugarMainClassTestLambdaDirectoryIncorrectlySet", size = "small", srcs = ["DesugarMainClassTest.java"], tags = ["no_windows"], diff --git a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD index acf6b80890..ec2aea4ed3 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD +++ b/src/test/java/com/google/devtools/build/android/desugar/runtime/BUILD @@ -30,6 +30,7 @@ java_test( "-Dfortest.simulated.android.sdk_int=18", "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$MimicDesugaringStrategy'", ], + tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTest", deps = [ ":throwable_extension_test_utility", @@ -51,6 +52,7 @@ java_test( "-Dcom.google.devtools.build.android.desugar.runtime.twr_disable_mimic=true", "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$NullDesugaringStrategy'", ], + tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTest", deps = [ ":throwable_extension_test_utility", @@ -71,6 +73,7 @@ java_test( "-Dfortest.simulated.android.sdk_int=19", "'-Dexpected.strategy=com.google.devtools.build.android.desugar.runtime.ThrowableExtension$$ReuseDesugaringStrategy'", ], + tags = ["no_windows"], test_class = "com.google.devtools.build.android.desugar.runtime.ThrowableExtensionTest", deps = [ ":throwable_extension_test_utility", |