Remove --experimental_disable_jvm from unit tests.
PiperOrigin-RevId: 168383478
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index 9577d1b..6330a41 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -139,7 +139,7 @@
// TODO(ulfjack): It would be better to get the better error message also if the Jvm is enabled.
// Currently: "No JVM target found under //tools/jdk:jdk that would work for bogus"
try {
- create("--cpu=bogus", "--experimental_disable_jvm");
+ create("--cpu=bogus");
fail();
} catch (InvalidConfigurationException e) {
assertThat(e)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java
index 4a20b8e..2461da4 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java
@@ -353,7 +353,7 @@
@Test
public void testCcDependencyLinkoptsArePropagatedToLinkAction() throws Exception {
- useConfiguration("--experimental_disable_go", "--experimental_disable_jvm", "--cpu=ios_i386",
+ useConfiguration("--experimental_disable_go", "--cpu=ios_i386",
"--crosstool_top=//tools/osx/crosstool:crosstool");
scratch.file("bin/BUILD",
@@ -394,7 +394,7 @@
@Test
public void testAlwaysLinkCcDependenciesAreForceLoaded() throws Exception {
- useConfiguration("--experimental_disable_go", "--experimental_disable_jvm", "--cpu=ios_i386",
+ useConfiguration("--experimental_disable_go", "--cpu=ios_i386",
"--crosstool_top=//tools/osx/crosstool:crosstool");
scratch.file("bin/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
index 26033f4..fb296f4 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -1319,7 +1319,7 @@
@Test
public void testApplePlatformEnvForCcLibraryDep() throws Exception {
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("package/BUILD",
"cc_library(",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 3a7647e..c730877 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -519,7 +519,7 @@
// Regression test for b/29094356.
protected void checkLinkActionDuplicateInputs(RuleType ruleType, ExtraLinkArgs extraLinkArgs)
throws Exception {
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("lib/BUILD",
"cc_library(",
@@ -3582,7 +3582,7 @@
private void checkCcDependency(
ConfigurationDistinguisher configurationDistinguisher, String targetName) throws Exception {
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("lib/BUILD",
"cc_library(",
@@ -3610,7 +3610,7 @@
protected void checkCcDependencyMultiArch(BinaryRuleTypePair ruleTypePair,
ConfigurationDistinguisher configurationDistinguisher) throws Exception {
- useConfiguration("--experimental_disable_jvm", "--ios_multi_cpus=armv7,arm64");
+ useConfiguration("--ios_multi_cpus=armv7,arm64");
scratch.file("lib/BUILD",
"cc_library(",
@@ -3710,7 +3710,7 @@
protected void checkGenruleWithoutJavaCcDependency(BinaryRuleTypePair ruleTypePair)
throws Exception {
- useConfiguration("--experimental_disable_jvm", "--ios_multi_cpus=armv7,arm64");
+ useConfiguration("--ios_multi_cpus=armv7,arm64");
String targets = ruleTypePair.targets(scratch, "x", "srcs", "['gen.m']");
scratch.file("x/BUILD",
@@ -3743,7 +3743,7 @@
protected void checkCcDependencyWithProtoDependency(BinaryRuleTypePair ruleTypePair,
ConfigurationDistinguisher configurationDistinguisher) throws Exception {
MockProtoSupport.setup(mockToolsConfig);
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("lib/BUILD",
"proto_library(",
" name = 'protolib',",
@@ -3832,7 +3832,7 @@
protected void checkCcDependencyWithProtoDependencyMultiArch(BinaryRuleTypePair ruleTypePair,
ConfigurationDistinguisher configurationDistinguisher) throws Exception {
MockProtoSupport.setup(mockToolsConfig);
- useConfiguration("--experimental_disable_jvm", "--ios_multi_cpus=armv7,arm64");
+ useConfiguration("--ios_multi_cpus=armv7,arm64");
scratch.file("lib/BUILD",
"proto_library(",
" name = 'protolib',",
@@ -4254,7 +4254,7 @@
" framework_imports = glob(['MyFramework.framework/*']),",
" is_dynamic = 1,",
")");
- useConfiguration("--ios_multi_cpus=i386,x86_64", "--experimental_disable_jvm");
+ useConfiguration("--ios_multi_cpus=i386,x86_64");
Action lipobinAction = lipoBinAction("//x:x");
@@ -4320,7 +4320,7 @@
scratch.file("package/BUILD",
"cc_library(name = 'cclib', srcs = ['dep.c'])");
- useConfiguration("--ios_multi_cpus=i386,x86_64", "--experimental_disable_jvm");
+ useConfiguration("--ios_multi_cpus=i386,x86_64");
Action appLipoAction = actionProducingArtifact("//x:x", "_lipobin");
String i386Prefix =
@@ -4366,7 +4366,7 @@
ruleType.scratchTarget(scratch,
"srcs", "['a.m']",
"deps", "['//lib1:lib1', '//lib2:lib2']");
- useConfiguration("--ios_multi_cpus=i386,x86_64", "--experimental_disable_jvm");
+ useConfiguration("--ios_multi_cpus=i386,x86_64");
Action lipobinAction = lipoBinAction("//x:x");
@@ -4401,7 +4401,7 @@
// Regression test for b/32310268.
protected void checkAliasedLinkoptsThroughObjcLibrary(RuleType ruleType) throws Exception {
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("bin/BUILD",
"objc_library(",
@@ -4430,7 +4430,7 @@
protected void checkCcDependencyLinkoptsArePropagatedToLinkAction(
RuleType ruleType) throws Exception {
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("bin/BUILD",
"cc_library(",
@@ -4468,7 +4468,7 @@
}
protected void checkObjcProviderLinkInputsInLinkAction(RuleType ruleType) throws Exception {
- useConfiguration("--experimental_disable_jvm", "--cpu=ios_i386");
+ useConfiguration("--cpu=ios_i386");
scratch.file("bin/defs.bzl",
"def _custom_rule_impl(ctx):",
