diff options
author | Liam Miller-Cushon <cushon@google.com> | 2016-04-18 20:44:30 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-19 09:46:41 +0000 |
commit | 3ee570fc8bdd54eeb0c041645dbe7789bdcb3d8b (patch) | |
tree | 6e5a83bca609b6e1fb5de94e6ddc0e5d6d1dbfb3 /src/test/java | |
parent | 08fb617b7e853e05a7536e9d078d46c4c040bb5e (diff) |
Deprecate top-level Java toolchain flags in favour of java_toolchain
This change disables --java_langtools, --javabuilder_top, --singlejar_top,
--genclass_top, and --ijar_top, and finishes replacing them with
java_toolchain.{javac,javabuilder,singlejar,genclass,ijar}.
RELNOTES: Replace --java_langtools, --javabuilder_top, --singlejar_top,
--genclass_top, and --ijar_top with
java_toolchain.{javac,javabuilder,singlejar,genclass,ijar}
--
MOS_MIGRATED_REVID=120154954
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 16 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java | 14 |
2 files changed, 22 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 20b87961ea..2ac21a77ec 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -88,8 +88,20 @@ public final class BazelAnalysisMock extends AnalysisMock { config.create( "/bazel_tools_workspace/tools/jdk/BUILD", "package(default_visibility=['//visibility:public'])", - "java_toolchain(name = 'toolchain', encoding = 'UTF-8', source_version = '8', ", - " target_version = '8')", + "java_toolchain(", + " name = 'toolchain',", + " encoding = 'UTF-8',", + " source_version = '8',", + " target_version = '8',", + " bootclasspath = [':bootclasspath'],", + " extclasspath = [':extclasspath'],", + " javac = [':langtools'],", + " javabuilder = ['JavaBuilder_deploy.jar'],", + " header_compiler = ['turbine_deploy.jar'],", + " singlejar = ['SingleJar_deploy.jar'],", + " genclass = ['GenClass_deploy.jar'],", + " ijar = ['ijar'],", + ")", "filegroup(name = 'jdk-null')", "filegroup(name = 'jdk-default', srcs = [':java'], path = 'jdk/jre')", "filegroup(name = 'jdk', srcs = [':jdk-default', ':jdk-null'])", diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index d475322d4e..beec598f4b 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -71,6 +71,8 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { " outs = ['d.txt'])", "java_library(name = 'jl',", " srcs = ['a.java'])", + "android_library(name = 'androidlib',", + " srcs = ['a.java'])", "java_import(name = 'asr',", " jars = [ 'asr.jar' ],", " srcjar = 'asr-src.jar',", @@ -604,26 +606,26 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { @Test public void testGetExecutablePrerequisite() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:jl"); - Object result = evalRuleContextCode(ruleContext, "ruleContext.executable._ijar"); - assertEquals("ijar", ((Artifact) result).getFilename()); + SkylarkRuleContext ruleContext = createRuleContext("//foo:androidlib"); + Object result = evalRuleContextCode(ruleContext, "ruleContext.executable._jarjar_bin"); + assertEquals("jarjar_bin", ((Artifact) result).getFilename()); } @Test public void testCreateSpawnActionArgumentsWithExecutableFilesToRunProvider() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:jl"); + SkylarkRuleContext ruleContext = createRuleContext("//foo:androidlib"); evalRuleContextCode( ruleContext, "ruleContext.action(\n" + " inputs = ruleContext.files.srcs,\n" + " outputs = ruleContext.files.srcs,\n" + " arguments = ['--a','--b'],\n" - + " executable = ruleContext.executable._ijar)\n"); + + " executable = ruleContext.executable._jarjar_bin)\n"); SpawnAction action = (SpawnAction) Iterables.getOnlyElement( ruleContext.getRuleContext().getAnalysisEnvironment().getRegisteredActions()); - assertThat(action.getCommandFilename()).endsWith("/ijar"); + assertThat(action.getCommandFilename()).endsWith("/jarjar_bin"); } @Test |