diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java | 8 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java | 30 |
2 files changed, 33 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java index 0872174ea0..47b4a98f41 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java @@ -1052,7 +1052,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase { } @Test - public void multipleExecutablesInTarget() throws Exception { + public void testMultipleExecutablesInTarget() throws Exception { scratch.file("foo/extension.bzl", "def _aspect_impl(target, ctx):", " return struct()", @@ -1061,8 +1061,8 @@ public class SkylarkAspectsTest extends AnalysisTestCase { " pass", "my_rule = rule(_main_rule_impl,", " attrs = { ", - " 'exe1' : attr.label(executable = True, allow_files = True),", - " 'exe2' : attr.label(executable = True, allow_files = True),", + " 'exe1' : attr.label(executable = True, allow_files = True, cfg = 'host'),", + " 'exe2' : attr.label(executable = True, allow_files = True, cfg = 'host'),", " },", ")" ); @@ -1081,7 +1081,6 @@ public class SkylarkAspectsTest extends AnalysisTestCase { assertThat(analysisResultOfAspect.hasError()).isFalse(); } - @Test public void aspectFragmentAccessSuccess() throws Exception { getConfiguredTargetForAspectFragment( @@ -1251,7 +1250,6 @@ public class SkylarkAspectsTest extends AnalysisTestCase { }; } - @Test public void aspectOutputsToBinDirectory() throws Exception { scratch.file( diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java index 8c6df5b6d6..da072b93ec 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java @@ -56,7 +56,9 @@ import com.google.devtools.build.lib.util.FileTypeSet; import java.util.Collection; import org.junit.Assert; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -65,6 +67,7 @@ import org.junit.runners.JUnit4; */ @RunWith(JUnit4.class) public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { + @Rule public ExpectedException thrown = ExpectedException.none(); @Before public final void createBuildFile() throws Exception { @@ -1083,6 +1086,7 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { } @Test + public void structsAsDeclaredProvidersTest() throws Exception { evalAndExport( "data = struct(x = 1)" @@ -1115,4 +1119,30 @@ public class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { " pass", "aspect(_impl, attr_aspects=['*', 'foo'])"); } + + @Test + public void testMandatoryConfigParameterForExecutableLabels() throws Exception { + scratch.file("third_party/foo/extension.bzl", + "def _main_rule_impl(ctx):", + " pass", + "my_rule = rule(_main_rule_impl,", + " attrs = { ", + " 'exe' : attr.label(executable = True, allow_files = True),", + " },", + ")" + ); + scratch.file("third_party/foo/BUILD", + "load('extension', 'my_rule')", + "my_rule(name = 'main', exe = ':tool.sh')" + ); + + try { + createRuleContext("//third_party/foo:main"); + Assert.fail(); + } catch (AssertionError e) { + assertThat(e.getMessage()).contains("cfg parameter is mandatory when executable=True is " + + "provided."); + } + } } + |