aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar lberki <lberki@google.com>2018-01-11 01:22:24 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-01-11 01:24:31 -0800
commitbc704360a93ff65c4d3684ab5cc0e45bd403bdd8 (patch)
tree3de0d09584b9ca11e32dafcc51ccbd2d26c4be39 /src/test
parentad0d7e946cd2ad05ec89c78a2f1959ffbbfa12a8 (diff)
Remove the unused --[no]experimental_disable_jvm command line option.
RELNOTES: The --[no]experimental_disable_jvm command line option is not supported anymore. PiperOrigin-RevId: 181575259
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java22
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java7
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java3
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java6
4 files changed, 1 insertions, 37 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 933cf95d78..6646529869 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1281,28 +1281,6 @@ public class BuildViewTest extends BuildViewTestBase {
.containsExactly(ruleClassProvider.getUniversalFragment());
}
- @Test
- public void errorOnMissingDepFragments() throws Exception {
- scratch.file("foo/BUILD",
- "cc_library(",
- " name = 'ccbin', ",
- " srcs = ['c.cc'],",
- " data = [':javalib'])",
- "java_library(",
- " name = 'javalib',",
- " srcs = ['javalib.java'])");
- useConfiguration("--experimental_dynamic_configs=on", "--experimental_disable_jvm");
- reporter.removeHandler(failFastHandler);
- try {
- update("//foo:ccbin");
- fail();
- } catch (ViewCreationFailedException e) {
- // Expected.
- }
- assertContainsEvent("//foo:ccbin: dependency //foo:javalib from attribute \"data\" is missing "
- + "required config fragments: Jvm");
- }
-
/**
* Here, injecting_rule injects an aspect which acts on a action_rule() and registers an action.
* The action_rule() registers another action of its own.
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
index 9fb2cbcc1e..e50718107a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataBindingTest.java
@@ -286,11 +286,4 @@ public class AndroidDataBindingTest extends AndroidBuildViewTestCase {
"package android.binary; public class MyApp {};");
assertThat(getConfiguredTarget("//java/android/binary:app")).isNotNull();
}
-
- @Test
- public void testNoJvmFragment() throws Exception {
- writeDataBindingFiles();
- useConfiguration("--experimental_disable_jvm");
- assertThat(getConfiguredTarget("//java/android/binary:app")).isNotNull();
- }
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
index d4e455c3a2..389e34a96d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
@@ -211,7 +211,6 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase {
useConfiguration(
"--ios_multi_cpus=i386,x86_64",
- "--experimental_disable_jvm",
"--crosstool_top=//tools/osx/crosstool:crosstool");
CommandAction action = (CommandAction) lipoLibAction("//package:test");
@@ -536,7 +535,6 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase {
"objc_library(name = 'objcLib', srcs = [ 'b.m' ], deps = [':avoidLib'])",
"objc_library(name = 'avoidLib', srcs = [ 'c.m' ])");
- useConfiguration("--experimental_disable_jvm");
CommandAction action = linkLibAction("//package:test");
assertThat(Artifact.toRootRelativePaths(action.getInputs())).contains(
"package/libobjcLib.a");
@@ -559,7 +557,6 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase {
"objc_library(name = 'objcLib', srcs = [ 'b.m' ])",
"objc_library(name = 'avoidLib', srcs = [ 'c.m' ])");
- useConfiguration("--experimental_disable_jvm");
CommandAction action = linkLibAction("//package:test");
assertThat(Artifact.toRootRelativePaths(action.getInputs())).contains(
"package/libobjcLib.a");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java
index 663d31a609..87f86666aa 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java
@@ -60,7 +60,6 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase {
@Test
public void testToolchainSelectionCcDepDefault() throws Exception {
- useConfiguration("--experimental_disable_jvm");
ScratchAttributeWriter
.fromLabelString(this, "cc_library", "//b:lib")
.setList("srcs", "b.cc")
@@ -107,9 +106,7 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase {
@Test
public void testToolchainSelectionMultiArchIos() throws Exception {
- useConfiguration(
- "--experimental_disable_jvm",
- "--ios_multi_cpus=armv7,arm64");
+ useConfiguration("--ios_multi_cpus=armv7,arm64");
ScratchAttributeWriter
.fromLabelString(this, "cc_library", "//b:lib")
.setList("srcs", "a.cc")
@@ -133,7 +130,6 @@ public class AppleToolchainSelectionTest extends ObjcRuleTestCase {
@Test
public void testToolchainSelectionMultiArchWatchos() throws Exception {
useConfiguration(
- "--experimental_disable_jvm",
"--ios_multi_cpus=armv7,arm64",
"--watchos_cpus=armv7k");
ScratchAttributeWriter