diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-10-02 16:31:55 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2015-10-02 18:02:42 +0000 |
| commit | 23c725b6824e7beac753779a5abeeb44c9be3bda (patch) | |
| tree | a2e6c696529731559b07ded8009fa73e425b58b4 /src/java_tools | |
| parent | 5f5991dfea02e1741de598ab207c2ece9659991d (diff) | |
Fix Java 7 test suite
- Prevent test from JavaBuilder to be run (mark them as JDK8 only).
- Hack to replace the JavaBuilder target so that test that needs JavaBuilder
will depends on the pre-built binary version.
Tested: bash -c 'export JAVA_VERSION=1.7; source scripts/ci/build.sh; bazel_build'
(and verified that there is no build failure). We might still have failing
tests (worker and runfiles) but the failure seems like flakiness.
--
MOS_MIGRATED_REVID=104504123
Diffstat (limited to 'src/java_tools')
| -rw-r--r-- | src/java_tools/buildjar/BUILD | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index 1edd5828cc..922c1280c2 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -185,6 +185,7 @@ java_test( # Simulates how Bazel invokes JavaBuilder "-Xbootclasspath/p:$${TEST_SRCDIR}/src/java_tools/buildjar/langtools-test.jar", ], + tags = ["jdk8"], deps = [ ":BazelJavaCompiler", ":langtools-test", |