Skip to content

Commit

Permalink
Change which tests should run on Windows
Browse files Browse the repository at this point in the history
Set no_windows on all tests that have quoted jvm_flags. Remove no_windows from
some platform-independent unit tests.

Fixes bazelbuild#3794

RELNOTES: None
PiperOrigin-RevId: 169909924
  • Loading branch information
aj-michael authored and katre committed Sep 25, 2017
1 parent 77112c6 commit f5e6969
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/test/java/com/google/devtools/build/android/desugar/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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)"],
Expand All @@ -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"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit f5e6969

Please sign in to comment.