Throw exception if 'None' value given to List-type command line optio…

…ns in Bazel transition definition
bazelbuild · Apr 28, 2021 · 8b473b5 · 8b473b5
1 parent 9e513f9
commit 8b473b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java
@@ -333,7 +333,7 @@ private static BuildOptions applyTransition(
                           optionValueAsList.stream().map(Object::toString).collect(joining(",")));
             }
           } else if (def.getType() == List.class && optionValue == null) {
-            convertedValue = def.getDefaultValue();
+            throw ValidationException.format("'None' value not allowed for List-type option '%s'. Please use '[]' instead if trying to set option to empty value.", optionName);
           } else if (optionValue == null || def.getType().isInstance(optionValue)) {
             convertedValue = optionValue;
           } else if (def.getType().equals(boolean.class) && optionValue instanceof Boolean) {

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkRuleTransitionProviderTest.java
@@ -1329,7 +1329,7 @@ public void successfulTypeConversionOfNativeListOptionEmptyList() throws Excepti
   }
 
   @Test
-  public void successfulTypeConversionOfNativeListOptionNone() throws Exception {
+  public void failedTypeConversionOfNativeListOptionNone() throws Exception {
     writeAllowlistFile();
     scratch.file(
         "test/transitions.bzl",
@@ -1355,9 +1355,9 @@ public void successfulTypeConversionOfNativeListOptionNone() throws Exception {
         "load('//test:rules.bzl', 'my_rule')",
         "my_rule(name = 'test')");
 
-    ConfiguredTarget ct = getConfiguredTarget("//test");
-    assertNoEvents();
-    assertThat(getConfiguration(ct).getOptions().get(CppOptions.class).coptList).isEmpty();
+    reporter.removeHandler(failFastHandler);
+    getConfiguredTarget("//test");
+    assertContainsEvent("'None' value not allowed for List-type option 'copt'. Please use '[]' instead if trying to set option to empty value.");
   }
 
   @Test