| commit | c6557ea56476fd56ee94f2476ac01849841bcaf0 | [log] [tgz] |
|---|---|---|
| author | dannark <dannark@google.com> | Wed Dec 13 15:06:39 2017 -0800 |
| committer | Copybara-Service <copybara-piper@google.com> | Wed Dec 13 15:08:41 2017 -0800 |
| tree | e085fb45e50cbe8bf09e292d69bd4c40ff20c780 | |
| parent | 817b535d92ee7fdb4740e2a99505ab10d4b54a0d [diff] |
Add check for $experimental_testsupport in isExperimentalJavaTest. This should be a no-op because because before testsupport is set (https://github.com/bazelbuild/bazel/blob/3d362fb9a122ceee6d781be127dfedbbff8051f8/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java#L509), it's checking that main_class is pointing to the experimental testrunner. This is needed because android_local_test doesn't have a main_class attribute and then bazel breaks when it tries to get the main_class attribute. RELNOTES: None PiperOrigin-RevId: 178964286
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java index de220a7..9f670c1 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -158,7 +158,8 @@ } private boolean isExperimentalJavaTest(RuleContext ruleContext) { - return TargetUtils.isTestRule(ruleContext.getRule()) + return ruleContext.attributes().has("$experimental_testsupport") + && TargetUtils.isTestRule(ruleContext.getRule()) && getMainClassFromRule(ruleContext).equals(EXPERIMENTAL_TEST_RUNNER_MAIN_CLASS); }