From 075b39d85a5e5aaf82a83dc07d2ea7ca7385a47f Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <dmarting@google.com>
Date: Mon, 15 Jun 2015 15:55:34 +0000
Subject: Set-up travis OSX to compile using JDK 7

This is introducing a few changes to use the Java compiler
from errorprone:
  - add the --java_langtools flag to the shell tests so
    we do the tests with the same java compiler tooling than
    Bazel, and
  - added the langtools the bootclasspath of the JavaBuilder
    tests.
  - tagged some tests and deactivated them on travis OSX
    because they either requires Java 8 or a lot of disk
    space.

To do the same change on a local install, one must:
  - change the source and target versions to 7 in the
    tools/jdk:toolchain target,
  - use the .travis/jdk7.WORKSPACE file instead of the
    default Bazel workspace (it contains a maven_jar
    refering to the errorprone's java compiler tools), and
  - set the JAVA_VERSION environent variable to "1.7".
The .travis/build.sh script does just that when under OS X.

--
Change-Id: Idb466cf47cf7df35a34fb0dd8d186628aae0cba7
Reviewed-on: https://bazel-review.googlesource.com/#/c/1520/
MOS_MIGRATED_REVID=96011123
---
 third_party/ijar/test/BUILD | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'third_party')

diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index d1c32e1cad..57c9f43c1e 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -39,6 +39,7 @@ sh_test(
         "//tools/jdk:langtools",
     ],
     shard_count = 5,
+    tags = ["zip"],
 )
 
 sh_test(
@@ -56,6 +57,7 @@ sh_test(
         "//src/test/shell:bashunit",
         "//third_party/ijar:zipper",
     ],
+    tags = ["zip"],
 )
 
 java_library(
@@ -63,6 +65,7 @@ java_library(
     testonly = 1,
     srcs = ["invokedynamic/ClassWithLambda.java"],
     javacopts = ["-source 8 -target 8"],
+    tags = ["jdk8"],
 )
 
 # For testing purposes: a class which exposes a private nested class in
@@ -94,6 +97,7 @@ java_library(
     name = "typeannotations2",
     srcs = glob(["typeannotations2/**/*.java"]),
     javacopts = ["-source 8 -target 8"],
+    tags = ["jdk8"],
 )
 
 java_test(
@@ -111,6 +115,7 @@ java_test(
         "package-info.java",
         ":interface_ijar_testlib",
     ],
+    tags = ["zip"],
     deps = [
         "//src/java_tools/buildjar:BazelJavaCompiler",
         "//third_party:asm",
-- 
cgit v1.2.3