diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
2 files changed, 10 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/constraints/AbstractConstraintsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/constraints/AbstractConstraintsTest.java index e7033d9a96..9b44af9493 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/constraints/AbstractConstraintsTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/constraints/AbstractConstraintsTest.java @@ -68,8 +68,9 @@ public abstract class AbstractConstraintsTest extends BuildViewTestCase { .append(getAttrDef("fulfills", fulfillsMap.get(env).toArray(new String[0]))) .append(")\n"); } + String envGroupName = name.contains("/") ? name.substring(name.lastIndexOf("/") + 1) : name; builder.append("environment_group(\n") - .append(" name = '" + name + "',\n") + .append(" name = '" + envGroupName + "',\n") .append(getAttrDef("environments", environments.toArray(new String[0])) + ",\n") .append(getAttrDef("defaults", defaults.toArray(new String[0])) + ",\n") .append(")"); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java index c019d9691a..007ac1a92f 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/constraints/ConstraintsTest.java @@ -800,4 +800,12 @@ public class ConstraintsTest extends AbstractConstraintsTest { assertNull(getConfiguredTarget("//ihave:nolimits")); assertContainsEvent("no such attribute 'restricted_to' in 'totally_free_rule'"); } + + public void testBuildingEnvironmentGroupDirectlyDoesntCrash() throws Exception { + new EnvironmentGroupMaker("buildenv/foo") + .setEnvironments("a", "b") + .setDefaults("a") + .make(); + assertNotNull(getConfiguredTarget("//buildenv/foo:foo")); + } } |