diff options
| author |  lberki <lberki@google.com> | 2018-01-11 01:22:24 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-11 01:24:31 -0800 |
| commit | bc704360a93ff65c4d3684ab5cc0e45bd403bdd8 (patch) | |
| tree | 3de0d09584b9ca11e32dafcc51ccbd2d26c4be39 /src/test/java/com/google/devtools/build/lib/rules/objc | |
| parent | ad0d7e946cd2ad05ec89c78a2f1959ffbbfa12a8 (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/java/com/google/devtools/build/lib/rules/objc')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/AppleToolchainSelectionTest.java | 6 |
2 files changed, 1 insertions, 8 deletions
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 |