Remove outdated --experimental_exec_groups test references.

PiperOrigin-RevId: 382609183
bazelbuild · Jul 1, 2021 · dfbef48 · dfbef48
1 parent c64b580
commit dfbef48
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 23 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java
@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.packages.Provider;
 import com.google.devtools.build.lib.packages.StarlarkProvider;
 import com.google.devtools.build.lib.packages.StructImpl;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -36,12 +35,6 @@
  */
 @RunWith(JUnit4.class)
 public class StarlarkExecGroupTest extends BuildViewTestCase {
-
-  @Before
-  public final void setUp() throws Exception {
-    setBuildLanguageOptions("--experimental_exec_groups");
-  }
-
   /**
    * Sets up two toolchains types, each with a single toolchain implementation and a single
    * exec_compatible_with platform.

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainsForTargetsTest.java
@@ -355,7 +355,6 @@ public void execGroups_named() throws Exception {
         "load('//toolchain:exec_group_rule.bzl', 'my_exec_group_rule')",
         "my_exec_group_rule(name = 'a')");
 
-    useConfiguration("--experimental_exec_groups");
     ToolchainCollection<UnloadedToolchainContext> toolchainCollection =
         getToolchainCollection("//a");
     assertThat(toolchainCollection).isNotNull();
@@ -415,7 +414,7 @@ public void execGroups_defaultAndNamed() throws Exception {
         "load('//toolchain:exec_group_rule.bzl', 'my_exec_group_rule')",
         "my_exec_group_rule(name = 'a')");
 
-    useConfiguration("--experimental_exec_groups", "--extra_toolchains=//extra:toolchain");
+    useConfiguration("--extra_toolchains=//extra:toolchain");
     ToolchainCollection<UnloadedToolchainContext> toolchainCollection =
         getToolchainCollection("//a");
     assertThat(toolchainCollection).isNotNull();

diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
@@ -2851,8 +2851,6 @@ public void testRuleAddExecutionConstraints() throws Exception {
 
   @Test
   public void testRuleAddExecGroup() throws Exception {
-    setBuildLanguageOptions("--experimental_exec_groups=true");
-
     registerDummyStarlarkFunction();
     scratch.file("test/BUILD", "toolchain_type(name = 'my_toolchain_type')");
     evalAndExport(
@@ -2913,8 +2911,6 @@ public void testTypeOfStruct() throws Exception {
 
   @Test
   public void testCreateExecGroup() throws Exception {
-    setBuildLanguageOptions("--experimental_exec_groups=true");
-
     scratch.file("test/BUILD", "toolchain_type(name = 'my_toolchain_type')");
     evalAndExport(
         ev,

diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
@@ -3041,7 +3041,6 @@ private void writeExecGroups() throws Exception {
         "something/BUILD",
         "load('//something:defs.bzl', 'use_exec_groups')",
         "use_exec_groups(name = 'nectarine')");
-    setBuildLanguageOptions("--experimental_exec_groups=true");
     useConfiguration(
         "--extra_toolchains=//toolchain:foo_toolchain,//toolchain:bar_toolchain",
         "--platforms=//platform:platform_1");
@@ -3103,7 +3102,6 @@ public void testExecGroup_duplicateToolchainType() throws Exception {
         "constraint_value(name = 'extra', constraint_setting = ':setting')",
         "load('//something:defs.bzl', 'use_exec_groups')",
         "use_exec_groups(name = 'nectarine')");
-    setBuildLanguageOptions("--experimental_exec_groups=true");
     useConfiguration(
         "--extra_toolchains=//toolchain:foo_toolchain,//toolchain:bar_toolchain",
         "--platforms=//platform:platform_1");

diff --git a/src/test/shell/bazel/toolchain_test.sh b/src/test/shell/bazel/toolchain_test.sh
@@ -1931,8 +1931,7 @@ load("//toolchain:rule_use_toolchain.bzl", "use_toolchain")
 use_toolchain(name = "use")
 EOF
 
-  bazel cquery "deps(//demo:use, 1)" --experimental_exec_groups \
-    &> $TEST_log || fail "Build failed"
+  bazel cquery "deps(//demo:use, 1)" &> $TEST_log || fail "Build failed"
   expect_log "<toolchain_context.resolved_labels: //toolchain:test_toolchain"
   expect_log "<ctx.exec_groups: group>"
   expect_log "//:test_toolchain_impl_1"

diff --git a/src/test/shell/integration/exec_group_test.sh b/src/test/shell/integration/exec_group_test.sh
@@ -629,9 +629,7 @@ sample_rule(
 EOF
 
   # Build the target, using debug messages to verify the correct platform was selected.
-  bazel build \
-    --experimental_exec_groups \
-    //${pkg}/demo:use &> $TEST_log || fail "Build failed"
+  bazel build //${pkg}/demo:use &> $TEST_log || fail "Build failed"
   cat bazel-bin/${pkg}/demo/use.log >> $TEST_log
   cat bazel-bin/${pkg}/demo/use_extra.log >> $TEST_log
   expect_log "hi from use, toolchain says foo"
@@ -688,9 +686,7 @@ sample_rule(
 EOF
 
   # Build the target, using debug messages to verify the correct platform was selected.
-  bazel build \
-    --experimental_exec_groups \
-    //${pkg}/demo:use &> $TEST_log || fail "Build failed"
+  bazel build //${pkg}/demo:use &> $TEST_log || fail "Build failed"
   cat bazel-bin/${pkg}/demo/use.log >> $TEST_log
   cat bazel-bin/${pkg}/demo/use_extra.log >> $TEST_log
   expect_log "hi from use, toolchain says bar"