diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-03-03 13:14:38 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-03-03 15:28:01 +0000 |
| commit | efd7ca1b420e00cf32839c07733e0e4a4d8b1bbb (patch) | |
| tree | 04eee06d2b6e277f3d0eaa7f326f1ae843b56746 /src/test/java/com/google | |
| parent | f745e99db7632cfb2145b6926f961e85f9084bc5 (diff) | |
Python provider is now available in Skylark
Using mandatoryProvidersList to validate python rules' dependency.
Added a SkylarkProvider named 'py' which is a SkylarkClassObject in Java and a
struct in Skylark. Native python rule and Skylark python rule should have this provider
so that they can depend on each other.
RELNOTES[NEW]: Native python rule can depend on skylark rule as long as skylark
rule provides 'py' provider.
--
MOS_MIGRATED_REVID=116241504
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 7f595157b7..c83f57d64f 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -25,12 +25,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.FileConfiguredTarget; +import com.google.devtools.build.lib.analysis.SkylarkProviders; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.rules.SkylarkRuleContext; import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider; -import com.google.devtools.build.lib.rules.python.PythonSourcesProvider; +import com.google.devtools.build.lib.rules.python.PyCommon; import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; import com.google.devtools.build.lib.syntax.SkylarkDict; import com.google.devtools.build.lib.syntax.SkylarkList; @@ -416,7 +417,8 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { TransitiveInfoCollection tic1 = (TransitiveInfoCollection) ((SkylarkList) result).get(0); assertNotNull(tic1.getProvider(JavaSourceJarsProvider.class)); // Check an unimplemented provider too - assertNull(tic1.getProvider(PythonSourcesProvider.class)); + assertNull(tic1.getProvider(SkylarkProviders.class) + .getValue(PyCommon.PYTHON_SKYLARK_PROVIDER_NAME)); } @Test |