Windows, test wrapper: rename the associated flag
Rename:
--[no]incompatible_windows_native_test_wrapper
to:
--[no]experimental_windows_native_test_wrapper
in order to avoid triggering this flag with
--all_incompatible_changes.
The test wrapper is not yet ready for general use
so turning it on with this flag (e.g. on CI) is
undesirable.
See https://github.com/bazelbuild/bazel/issues/5508
Fixes https://github.com/bazelbuild/bazel/issues/6859
Closes #6858.
PiperOrigin-RevId: 224490751
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
index 2e78555..3f4a320 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java
@@ -35,7 +35,6 @@
import com.google.devtools.common.options.OptionDefinition;
import com.google.devtools.common.options.OptionDocumentationCategory;
import com.google.devtools.common.options.OptionEffectTag;
-import com.google.devtools.common.options.OptionMetadataTag;
import com.google.devtools.common.options.OptionsParser;
import com.google.devtools.common.options.OptionsParsingException;
import com.google.devtools.common.options.TriState;
@@ -218,7 +217,7 @@
public Label coverageReportGenerator;
@Option(
- name = "incompatible_windows_native_test_wrapper",
+ name = "experimental_windows_native_test_wrapper",
// Design:
// https://github.com/laszlocsomor/proposals/blob/win-test-runner/designs/2018-07-18-windows-native-test-runner.md
documentationCategory = OptionDocumentationCategory.TESTING,
@@ -228,10 +227,6 @@
OptionEffectTag.LOADING_AND_ANALYSIS,
OptionEffectTag.TEST_RUNNER,
},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES,
- },
defaultValue = "false",
help =
"On Windows: if true, uses the C++ test wrapper to run tests, otherwise uses "
diff --git a/src/test/py/bazel/test_wrapper_test.py b/src/test/py/bazel/test_wrapper_test.py
index e0764a2..6ca5179 100644
--- a/src/test/py/bazel/test_wrapper_test.py
+++ b/src/test/py/bazel/test_wrapper_test.py
@@ -545,7 +545,7 @@
def testTestExecutionWithTestSetupSh(self):
self._CreateMockWorkspace()
- flag = '--noincompatible_windows_native_test_wrapper'
+ flag = '--noexperimental_windows_native_test_wrapper'
self._AssertPassingTest(flag)
self._AssertFailingTest(flag)
self._AssertPrintingTest(flag)
@@ -581,7 +581,7 @@
def testTestExecutionWithTestWrapperExe(self):
self._CreateMockWorkspace()
- flag = '--incompatible_windows_native_test_wrapper'
+ flag = '--experimental_windows_native_test_wrapper'
self._AssertPassingTest(flag)
self._AssertFailingTest(flag)
self._AssertPrintingTest(flag)