aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools
diff options
context:
space:
mode:
authorGravatar Liam Miller-Cushon <cushon@google.com>2016-01-29 20:14:48 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-02-01 09:45:50 +0000
commit191646d44dc8cf51391f5061fbf08a58e7706a03 (patch)
treee09c0d51eb527e6b743db2fd069aa2c660622a79 /src/test/java/com/google/devtools
parentf1121951d4e9a77291956f58be1c32a1f444d2d9 (diff)
RELNOTES[INC]: Remove JAVAC "Make" variable
The JAVAC "Make" variable is the javac packaged with the host JDK, which is not necessarily the same version used to compile java_library rules. Users should typically use java_library directly. If a manual javac invocation is required, BazelJavac uses the same javac version and flags as java_library. In the rare cases where the host JDK's compiler is actually desired, prefer `$(JAVABASE)/bin/javac` to `$(JAVAC)` for clarity. -- MOS_MIGRATED_REVID=113386241
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r--src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 709557ab8f..e83651cff0 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -831,10 +831,10 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
@Test
public void testDefinedMakeVariable() throws Exception {
SkylarkRuleContext ctx = createRuleContext("//foo:baz");
- String javac = (String) evalRuleContextCode(ctx, "ruleContext.var['JAVAC']");
+ String java = (String) evalRuleContextCode(ctx, "ruleContext.var['JAVA']");
// Get the last path segment
- javac = javac.substring(javac.lastIndexOf('/'));
- assertEquals("/javac", javac);
+ java = java.substring(java.lastIndexOf('/'));
+ assertEquals("/java", java);
}
@Test