The great Skylark -> Starlark class migration:
For rules in tests:
- "skylark_*" -> "starlark_*"
- "/skylark*" -> "/starlark*"
PiperOrigin-RevId: 315759741
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
index 4be3129..dc1419b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
@@ -77,7 +77,7 @@
new Precomputed<>("default_visibility");
public static final Precomputed<StarlarkSemantics> STARLARK_SEMANTICS =
- new Precomputed<>("skylark_semantics");
+ new Precomputed<>("starlark_semantics");
static final Precomputed<UUID> BUILD_ID = new UnsharablePrecomputed<>("build_id");
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
index 8f9d50a..06878f7 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
@@ -23,7 +23,7 @@
/** Configuration options for Starlark debugging. */
public final class StarlarkDebuggerOptions extends OptionsBase {
@Option(
- name = "experimental_skylark_debug",
+ name = "experimental_starlark_debug",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.EXECUTION},
@@ -34,7 +34,7 @@
public boolean debugStarlark;
@Option(
- name = "experimental_skylark_debug_server_port",
+ name = "experimental_starlark_debug_server_port",
defaultValue = "7300",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.EXECUTION},
@@ -43,7 +43,7 @@
public int debugServerPort;
@Option(
- name = "experimental_skylark_debug_verbose_logging",
+ name = "experimental_starlark_debug_verbose_logging",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.TERMINAL_OUTPUT},
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
index c164679..0b81df0 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
@@ -724,8 +724,8 @@
p.debugPrint(x);
separator = sep;
}
- // As part of the integration test "skylark_flag_test.sh", if the
- // "--internal_skylark_flag_test_canary" flag is enabled, append an extra marker string to
+ // As part of the integration test "starlark_flag_test.sh", if the
+ // "--internal_starlark_flag_test_canary" flag is enabled, append an extra marker string to
// the output.
if (thread.getSemantics().internalStarlarkFlagTestCanary()) {
p.append("<== Starlark flag test ==>");
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java
index ca3e57b..fd776c8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java
@@ -102,14 +102,14 @@
setRulesAvailableInTests(NATIVE_TEST_RULE, NATIVE_LIB_RULE);
scratch.file(
"test/test.bzl",
- "def _skylark_test_impl(ctx):",
+ "def _starlark_test_impl(ctx):",
" executable = ctx.actions.declare_file(ctx.label.name)",
" ctx.actions.write(executable, '#!/bin/true', is_executable=True)",
" return DefaultInfo(",
" executable=executable,",
" )",
- "skylark_test = rule(",
- " implementation = _skylark_test_impl,",
+ "starlark_test = rule(",
+ " implementation = _starlark_test_impl,",
" test = True,",
" executable = True,",
" attrs = {",
@@ -119,10 +119,10 @@
")");
scratch.file(
"test/lib.bzl",
- "def _skylark_lib_impl(ctx):",
+ "def _starlark_lib_impl(ctx):",
" pass",
- "skylark_lib = rule(",
- " implementation = _skylark_lib_impl,",
+ "starlark_lib = rule(",
+ " implementation = _starlark_lib_impl,",
" attrs = {",
" 'deps': attr.label_list(),",
" 'host_deps': attr.label_list(cfg='host'),",
@@ -157,43 +157,43 @@
public void flagOffDifferentTestOptions_ResultsInDifferentCTs() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--notrim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
update(
"//test:suite",
"//test:native_test",
- "//test:skylark_test",
+ "//test:starlark_test",
"//test:native_dep",
- "//test:skylark_dep",
+ "//test:starlark_dep",
"//test:native_shared_dep",
- "//test:skylark_shared_dep");
+ "//test:starlark_shared_dep");
LinkedHashSet<SkyKey> visitedTargets = new LinkedHashSet<>(getSkyframeEvaluatedTargetKeys());
// asserting that the top-level targets are the same as the ones in the diamond starting at
// //test:suite
@@ -202,22 +202,22 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 1)
.put("//test:native_test", 1)
- .put("//test:skylark_test", 1)
+ .put("//test:starlark_test", 1)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
useConfiguration("--notrim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeB");
update(
"//test:suite",
"//test:native_test",
- "//test:skylark_test",
+ "//test:starlark_test",
"//test:native_dep",
- "//test:skylark_dep",
+ "//test:starlark_dep",
"//test:native_shared_dep",
- "//test:skylark_shared_dep");
+ "//test:starlark_shared_dep");
visitedTargets.addAll(getSkyframeEvaluatedTargetKeys());
// asserting that we got no overlap between the two runs, we had to build different versions of
// all seven targets
@@ -226,11 +226,11 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 2)
.put("//test:native_test", 2)
- .put("//test:skylark_test", 2)
+ .put("//test:starlark_test", 2)
.put("//test:native_dep", 2)
- .put("//test:skylark_dep", 2)
+ .put("//test:starlark_dep", 2)
.put("//test:native_shared_dep", 2)
- .put("//test:skylark_shared_dep", 2)
+ .put("//test:starlark_shared_dep", 2)
.build());
}
@@ -238,33 +238,33 @@
public void flagOffDifferentTestOptions_CacheCleared() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--notrim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
update("//test:suite");
@@ -279,11 +279,11 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 1)
.put("//test:native_test", 1)
- .put("//test:skylark_test", 1)
+ .put("//test:starlark_test", 1)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
}
@@ -291,43 +291,43 @@
public void flagOnDifferentTestOptions_SharesCTsForNonTestRules() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
update(
"//test:suite",
"//test:native_test",
- "//test:skylark_test",
+ "//test:starlark_test",
"//test:native_dep",
- "//test:skylark_dep",
+ "//test:starlark_dep",
"//test:native_shared_dep",
- "//test:skylark_shared_dep");
+ "//test:starlark_shared_dep");
LinkedHashSet<SkyKey> visitedTargets = new LinkedHashSet<>(getSkyframeEvaluatedTargetKeys());
// asserting that the top-level targets are the same as the ones in the diamond starting at
// //test:suite
@@ -336,22 +336,22 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 1)
.put("//test:native_test", 1)
- .put("//test:skylark_test", 1)
+ .put("//test:starlark_test", 1)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeB");
update(
"//test:suite",
"//test:native_test",
- "//test:skylark_test",
+ "//test:starlark_test",
"//test:native_dep",
- "//test:skylark_dep",
+ "//test:starlark_dep",
"//test:native_shared_dep",
- "//test:skylark_shared_dep");
+ "//test:starlark_shared_dep");
visitedTargets.addAll(getSkyframeEvaluatedTargetKeys());
// asserting that our non-test rules matched between the two runs, we had to build different
// versions of the three test targets but not the four non-test targets
@@ -360,11 +360,11 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 2)
.put("//test:native_test", 2)
- .put("//test:skylark_test", 2)
+ .put("//test:starlark_test", 2)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
}
@@ -372,33 +372,33 @@
public void flagOnDifferentTestOptions_CacheKeptBetweenRuns() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
update("//test:suite");
@@ -410,9 +410,9 @@
getSkyframeEvaluatedTargetKeys(),
new ImmutableMap.Builder<String, Integer>()
.put("//test:native_dep", 0)
- .put("//test:skylark_dep", 0)
+ .put("//test:starlark_dep", 0)
.put("//test:native_shared_dep", 0)
- .put("//test:skylark_shared_dep", 0)
+ .put("//test:starlark_shared_dep", 0)
.build());
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
update("//test:suite");
@@ -422,7 +422,7 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 0)
.put("//test:native_test", 0)
- .put("//test:skylark_test", 0)
+ .put("//test:starlark_test", 0)
.build());
}
@@ -430,33 +430,33 @@
public void flagOnDifferentNonTestOptions_CacheCleared() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--define=Test=TypeA");
update("//test:suite");
@@ -471,11 +471,11 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 1)
.put("//test:native_test", 1)
- .put("//test:skylark_test", 1)
+ .put("//test:starlark_test", 1)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
}
@@ -483,33 +483,33 @@
public void flagOffToOn_CacheCleared() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--notrim_test_configuration", "--noexpand_test_suites");
update("//test:suite");
@@ -522,11 +522,11 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 1)
.put("//test:native_test", 1)
- .put("//test:skylark_test", 1)
+ .put("//test:starlark_test", 1)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
}
@@ -534,33 +534,33 @@
public void flagOnToOff_CacheCleared() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':native_test', ':skylark_test'],",
+ " tests = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites");
update("//test:suite");
@@ -573,11 +573,11 @@
new ImmutableMap.Builder<String, Integer>()
.put("//test:suite", 1)
.put("//test:native_test", 1)
- .put("//test:skylark_test", 1)
+ .put("//test:starlark_test", 1)
.put("//test:native_dep", 1)
- .put("//test:skylark_dep", 1)
+ .put("//test:starlark_dep", 1)
.put("//test:native_shared_dep", 1)
- .put("//test:skylark_shared_dep", 1)
+ .put("//test:starlark_shared_dep", 1)
.build());
}
@@ -585,54 +585,54 @@
public void flagOnDynamicConfigsNotrimHostDeps_AreNotAnalyzedAnyExtraTimes() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"native_test(",
" name = 'native_outer_test',",
- " deps = [':native_test', ':skylark_test'],",
- " host_deps = [':native_test', ':skylark_test'],",
+ " deps = [':native_test', ':starlark_test'],",
+ " host_deps = [':native_test', ':starlark_test'],",
")",
- "skylark_test(",
- " name = 'skylark_outer_test',",
- " deps = [':native_test', ':skylark_test'],",
- " host_deps = [':native_test', ':skylark_test'],",
+ "starlark_test(",
+ " name = 'starlark_outer_test',",
+ " deps = [':native_test', ':starlark_test'],",
+ " host_deps = [':native_test', ':starlark_test'],",
")",
"native_test(",
" name = 'native_test',",
- " deps = [':native_dep', ':skylark_dep'],",
- " host_deps = [':native_dep', ':skylark_dep'],",
+ " deps = [':native_dep', ':starlark_dep'],",
+ " host_deps = [':native_dep', ':starlark_dep'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = [':native_dep', ':skylark_dep'],",
- " host_deps = [':native_dep', ':skylark_dep'],",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = [':native_dep', ':starlark_dep'],",
+ " host_deps = [':native_dep', ':starlark_dep'],",
")",
"native_lib(",
" name = 'native_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
- " host_deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
+ " host_deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':native_shared_dep', 'skylark_shared_dep'],",
- " host_deps = [':native_shared_dep', 'skylark_shared_dep'],",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':native_shared_dep', 'starlark_shared_dep'],",
+ " host_deps = [':native_shared_dep', 'starlark_shared_dep'],",
")",
"native_lib(",
" name = 'native_shared_dep',",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--trim_test_configuration", "--experimental_dynamic_configs=notrim");
update(
"//test:native_outer_test",
- "//test:skylark_outer_test",
+ "//test:starlark_outer_test",
"//test:native_test",
- "//test:skylark_test",
+ "//test:starlark_test",
"//test:native_dep",
- "//test:skylark_dep",
+ "//test:starlark_dep",
"//test:native_shared_dep",
- "//test:skylark_shared_dep");
+ "//test:starlark_shared_dep");
LinkedHashSet<SkyKey> visitedTargets = new LinkedHashSet<>(getSkyframeEvaluatedTargetKeys());
assertNumberOfConfigurationsOfTargets(
visitedTargets,
@@ -640,11 +640,11 @@
// each target should be analyzed in two and only two configurations: target and host
// there should not be a "host trimmed" and "host untrimmed" version
.put("//test:native_test", 2)
- .put("//test:skylark_test", 2)
+ .put("//test:starlark_test", 2)
.put("//test:native_dep", 2)
- .put("//test:skylark_dep", 2)
+ .put("//test:starlark_dep", 2)
.put("//test:native_shared_dep", 2)
- .put("//test:skylark_shared_dep", 2)
+ .put("//test:starlark_shared_dep", 2)
.build());
}
@@ -652,25 +652,25 @@
public void flagOffConfigSetting_CanInspectTestOptions() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"config_setting(",
" name = 'test_mode',",
" values = {'test_arg': 'TypeA'},",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = select({':test_mode': [':skylark_shared_dep'], '//conditions:default': []})",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = select({':test_mode': [':starlark_shared_dep'], '//conditions:default': []})",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = select({':test_mode': [':skylark_shared_dep'], '//conditions:default': []})",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = select({':test_mode': [':starlark_shared_dep'], '//conditions:default': []})",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--notrim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
- update("//test:test_mode", "//test:skylark_test", "//test:skylark_dep");
+ update("//test:test_mode", "//test:starlark_test", "//test:starlark_dep");
// All 3 targets (top level, under a test, under a non-test) should successfully analyze.
assertThat(getAnalysisResult().getTargetsToBuild()).hasSize(3);
}
@@ -680,28 +680,28 @@
reporter.removeHandler(failFastHandler);
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"config_setting(",
" name = 'test_mode',",
" values = {'test_arg': 'TypeA'},",
")",
- "skylark_test(",
- " name = 'skylark_test',",
- " deps = select({':test_mode': [':skylark_shared_dep'], '//conditions:default': []})",
+ "starlark_test(",
+ " name = 'starlark_test',",
+ " deps = select({':test_mode': [':starlark_shared_dep'], '//conditions:default': []})",
")",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = select({':test_mode': [':skylark_shared_dep'], '//conditions:default': []})",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = select({':test_mode': [':starlark_shared_dep'], '//conditions:default': []})",
")",
- "skylark_lib(",
- " name = 'skylark_shared_dep',",
+ "starlark_lib(",
+ " name = 'starlark_shared_dep',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
- assertThrows(ViewCreationFailedException.class, () -> update("//test:skylark_dep"));
+ assertThrows(ViewCreationFailedException.class, () -> update("//test:starlark_dep"));
assertContainsEvent("unknown option: 'test_arg'");
- update("//test:test_mode", "//test:skylark_test");
+ update("//test:test_mode", "//test:starlark_test");
// When reached through only test targets (top level, under a test) analysis should succeed
assertThat(getAnalysisResult().getTargetsToBuild()).hasSize(2);
}
@@ -710,18 +710,18 @@
public void flagOffNonTestTargetWithTestDependencies_IsPermitted() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':skylark_test'],",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':starlark_test'],",
" testonly = 1,",
")",
- "skylark_test(",
- " name = 'skylark_test',",
+ "starlark_test(",
+ " name = 'starlark_test',",
")");
useConfiguration("--notrim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
- update("//test:skylark_dep");
+ update("//test:starlark_dep");
assertThat(getAnalysisResult().getTargetsToBuild()).isNotEmpty();
}
@@ -730,20 +730,20 @@
reporter.removeHandler(failFastHandler);
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
- "skylark_lib(",
- " name = 'skylark_dep',",
- " deps = [':skylark_test'],",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
+ "starlark_lib(",
+ " name = 'starlark_dep',",
+ " deps = [':starlark_test'],",
" testonly = 1,",
")",
- "skylark_test(",
- " name = 'skylark_test',",
+ "starlark_test(",
+ " name = 'starlark_test',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
- assertThrows(ViewCreationFailedException.class, () -> update("//test:skylark_dep"));
+ assertThrows(ViewCreationFailedException.class, () -> update("//test:starlark_dep"));
assertContainsEvent(
- "all rules of type skylark_test require the presence of all of "
+ "all rules of type starlark_test require the presence of all of "
+ "[TestConfiguration], but these were all disabled");
}
@@ -751,24 +751,24 @@
public void flagOnTestSuiteWithTestDependencies_CanBeAnalyzed() throws Exception {
scratch.file(
"test/BUILD",
- "load(':test.bzl', 'skylark_test')",
- "load(':lib.bzl', 'skylark_lib')",
+ "load(':test.bzl', 'starlark_test')",
+ "load(':lib.bzl', 'starlark_lib')",
"test_suite(",
" name = 'suite',",
- " tests = [':skylark_test', ':suite_2'],",
+ " tests = [':starlark_test', ':suite_2'],",
")",
"test_suite(",
" name = 'suite_2',",
- " tests = [':skylark_test_2', ':skylark_test_3'],",
+ " tests = [':starlark_test_2', ':starlark_test_3'],",
")",
- "skylark_test(",
- " name = 'skylark_test',",
+ "starlark_test(",
+ " name = 'starlark_test',",
")",
- "skylark_test(",
- " name = 'skylark_test_2',",
+ "starlark_test(",
+ " name = 'starlark_test_2',",
")",
- "skylark_test(",
- " name = 'skylark_test_3',",
+ "starlark_test(",
+ " name = 'starlark_test_3',",
")");
useConfiguration("--trim_test_configuration", "--noexpand_test_suites", "--test_arg=TypeA");
update("//test:suite", "//test:suite_2");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
index 2f67db7..0e6ecbd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
@@ -5271,15 +5271,15 @@
setupCcOutputsTest();
scratch.file(
"foo/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
" object1 = 'object1.o',",
" pic_object1 = 'pic_object1.o',",
" object2 = 'object2.o',",
" pic_object2 = 'pic_object2.o',",
")");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
CcCompilationOutputs compilationOutputs =
(CcCompilationOutputs) getMyInfoFromTarget(target).getValue("compilation_outputs");
assertThat(
@@ -5321,9 +5321,9 @@
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", String.join("", "disallow_nopic_outputs=True"));
assertThat(getConfiguredTarget("//foo:bin")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
- assertThat(getFilenamesToBuild(target)).doesNotContain("skylark_lib.o");
- assertThat(getFilenamesToBuild(target)).contains("skylark_lib.pic.o");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
+ assertThat(getFilenamesToBuild(target)).doesNotContain("starlark_lib.o");
+ assertThat(getFilenamesToBuild(target)).contains("starlark_lib.pic.o");
}
@Test
@@ -5331,9 +5331,9 @@
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", String.join("", "disallow_pic_outputs=True"));
assertThat(getConfiguredTarget("//foo:bin")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
- assertThat(getFilenamesToBuild(target)).contains("skylark_lib.o");
- assertThat(getFilenamesToBuild(target)).doesNotContain("skylark_lib.pic.o");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
+ assertThat(getFilenamesToBuild(target)).contains("starlark_lib.o");
+ assertThat(getFilenamesToBuild(target)).doesNotContain("starlark_lib.pic.o");
}
@Test
@@ -5345,9 +5345,9 @@
createFilesForTestingCompilation(scratch, "tools/build_defs/foo", "");
useConfiguration("--compilation_mode=opt");
assertThat(getConfiguredTarget("//foo:bin")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
- assertThat(getFilenamesToBuild(target)).contains("skylark_lib.pic.o");
- assertThat(getFilenamesToBuild(target)).contains("skylark_lib.o");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
+ assertThat(getFilenamesToBuild(target)).contains("starlark_lib.pic.o");
+ assertThat(getFilenamesToBuild(target)).contains("starlark_lib.o");
}
@Test
@@ -5370,25 +5370,25 @@
CcToolchainConfig.builder()
.withFeatures(CppRuleClasses.SUPPORTS_DYNAMIC_LINKER, CppRuleClasses.SUPPORTS_PIC));
createFilesForTestingLinking(scratch, "tools/build_defs/foo", /* linkProviderLines= */ "");
- assertThat(getConfiguredTarget("//foo:skylark_lib")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ assertThat(getConfiguredTarget("//foo:starlark_lib")).isNotNull();
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(
getFilesToBuild(target).toList().stream()
.map(x -> x.getFilename())
.collect(ImmutableList.toImmutableList()))
- .contains("libskylark_lib.a");
+ .contains("libstarlark_lib.a");
}
@Test
public void testDoNotCreateStaticLibraries() throws Exception {
createFilesForTestingLinking(scratch, "tools/build_defs/foo", "disallow_static_libraries=True");
- assertThat(getConfiguredTarget("//foo:skylark_lib")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ assertThat(getConfiguredTarget("//foo:starlark_lib")).isNotNull();
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(
getFilesToBuild(target).toList().stream()
.map(x -> x.getFilename())
.collect(ImmutableList.toImmutableList()))
- .doesNotContain("libskylark_lib.a");
+ .doesNotContain("libstarlark_lib.a");
}
private List<String> getFilenamesToBuild(ConfiguredTarget target) {
@@ -5408,7 +5408,7 @@
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "user_compile_flags=['-COMPILATION_OPTION']");
assertThat(getConfiguredTarget("//foo:bin")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
assertThat(action.getArguments()).contains("-COMPILATION_OPTION");
@@ -5418,7 +5418,7 @@
public void testIncludeDirs() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "includes=['foo/bar', 'baz/qux']");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
@@ -5429,7 +5429,7 @@
public void testSystemIncludeDirs() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "system_includes=['foo/bar', 'baz/qux']");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
@@ -5442,7 +5442,7 @@
public void testQuoteIncludeDirs() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "quote_includes=['foo/bar', 'baz/qux']");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
@@ -5455,7 +5455,7 @@
public void testFrameworkIncludeDirs() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "framework_includes=['foo/bar', 'baz/qux']");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
@@ -5466,7 +5466,7 @@
public void testDefines() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "defines=['DEFINE1', 'DEFINE2']");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
@@ -5477,22 +5477,22 @@
public void testHeaders() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", /* compileProviderLines= */ "");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CcInfo ccInfo = target.get(CcInfo.PROVIDER);
assertThat(artifactsToStrings(ccInfo.getCcCompilationContext().getDeclaredIncludeSrcs()))
.containsAtLeast(
- "src foo/dep2.h", "src foo/skylark_lib.h", "src foo/private_skylark_lib.h");
+ "src foo/dep2.h", "src foo/starlark_lib.h", "src foo/private_starlark_lib.h");
}
@Test
public void testCompileOutputHasSuffix() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", /* compileProviderLines= */ "");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
assertThat(artifactsToStrings(getFilesToBuild(target)))
- .contains("bin foo/_objs/skylark_lib_suffix/skylark_lib.o");
+ .contains("bin foo/_objs/starlark_lib_suffix/starlark_lib.o");
}
@Test
@@ -5500,7 +5500,7 @@
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", /* compileProviderLines= */ "");
assertThat(getConfiguredTarget("//foo:bin")).isNotNull();
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
assertThat(action.getArguments()).containsAtLeast("-DDEFINE_DEP1", "-DDEFINE_DEP2");
@@ -5509,7 +5509,7 @@
@Test
public void testLinkingOutputs() throws Exception {
createFiles(scratch, "tools/build_defs/foo");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
@SuppressWarnings("unchecked")
Sequence<LibraryToLink> libraries =
@@ -5518,14 +5518,14 @@
libraries.stream()
.map(x -> x.getResolvedSymlinkDynamicLibrary().getFilename())
.collect(ImmutableList.toImmutableList()))
- .contains("libskylark_lib.so");
+ .contains("libstarlark_lib.so");
}
@Test
public void testUserLinkFlags() throws Exception {
createFilesForTestingLinking(
scratch, "tools/build_defs/foo", "user_link_flags=['-LINKING_OPTION']");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
assertThat(target.get(CcInfo.PROVIDER).getCcLinkingContext().getFlattenedUserLinkFlags())
.contains("-LINKING_OPTION");
@@ -5544,7 +5544,7 @@
@Test
public void testAlwayslinkTrue() throws Exception {
createFilesForTestingLinking(scratch, "tools/build_defs/foo", "alwayslink=True");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
assertThat(
target.get(CcInfo.PROVIDER).getCcLinkingContext().getLibraries().toList().stream()
@@ -5556,7 +5556,7 @@
@Test
public void testAlwayslinkFalse() throws Exception {
createFilesForTestingLinking(scratch, "tools/build_defs/foo", "alwayslink=False");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
assertThat(
target.get(CcInfo.PROVIDER).getCcLinkingContext().getLibraries().toList().stream()
@@ -5569,7 +5569,7 @@
public void testAdditionalLinkingInputs() throws Exception {
createFilesForTestingLinking(
scratch, "tools/build_defs/foo", "additional_inputs=ctx.files._additional_inputs");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
assertThat(target.get(CcInfo.PROVIDER).getCcLinkingContext().getNonCodeInputs().toList())
.hasSize(1);
@@ -5579,7 +5579,7 @@
public void testAdditionalCompilationInputs() throws Exception {
createFilesForTestingCompilation(
scratch, "tools/build_defs/foo", "additional_inputs=ctx.files._additional_compiler_inputs");
- ConfiguredTarget target = getConfiguredTarget("//foo:skylark_lib");
+ ConfiguredTarget target = getConfiguredTarget("//foo:starlark_lib");
assertThat(target).isNotNull();
CppCompileAction action =
(CppCompileAction) getGeneratingAction(artifactByPath(getFilesToBuild(target), ".o"));
@@ -5625,13 +5625,13 @@
scratch.file(
"bar/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
- " srcs = ['skylark_lib.qweqwe'],",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
+ " srcs = ['starlark_lib.qweqwe'],",
")");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//bar:skylark_lib");
+ getConfiguredTarget("//bar:starlark_lib");
assertContainsEvent("The list of possible extensions for 'srcs'");
}
@@ -5801,8 +5801,8 @@
invalidatePackages();
scratch.file(
"b/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
" name = 'b',",
" srcs = ['b.cc'],",
" aspect_deps = ['@r//p:a']",
@@ -5952,7 +5952,7 @@
" },",
fragments,
")",
- "def _cc_skylark_library_impl(ctx):",
+ "def _cc_starlark_library_impl(ctx):",
" dep_compilation_contexts = []",
" dep_linking_contexts = []",
" for dep in ctx.attr._deps:",
@@ -5998,8 +5998,8 @@
" DefaultInfo(files=depset(files_to_build)),",
" CcInfo(compilation_context=compilation_context,",
" linking_context=linking_context)]",
- "cc_skylark_library = rule(",
- " implementation = _cc_skylark_library_impl,",
+ "cc_starlark_library = rule(",
+ " implementation = _cc_starlark_library_impl,",
" attrs = {",
" 'srcs': attr.label_list(allow_files=True),",
" 'public_hdrs': attr.label_list(allow_files=True),",
@@ -6017,7 +6017,7 @@
")");
scratch.file(
"foo/BUILD",
- "load('//" + bzlFilePath + ":extension.bzl', 'cc_skylark_library')",
+ "load('//" + bzlFilePath + ":extension.bzl', 'cc_starlark_library')",
"cc_library(",
" name = 'dep1',",
" srcs = ['dep1.cc'],",
@@ -6032,15 +6032,15 @@
" defines = ['DEFINE_DEP2'],",
" linkopts = ['-DEP2_LINKOPT'],",
")",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
- " srcs = ['skylark_lib.cc'],",
- " public_hdrs = ['skylark_lib.h'],",
- " private_hdrs = ['private_skylark_lib.h'],",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
+ " srcs = ['starlark_lib.cc'],",
+ " public_hdrs = ['starlark_lib.h'],",
+ " private_hdrs = ['private_starlark_lib.h'],",
")",
"cc_binary(",
" name = 'bin',",
- " deps = ['skylark_lib'],",
+ " deps = ['starlark_lib'],",
")");
}
@@ -6048,13 +6048,13 @@
createFiles(scratch, "tools/build_defs/foo");
scratch.file(
"bar/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
- " " + attrName + " = ['skylark_lib.cannotpossiblybevalid'],",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
+ " " + attrName + " = ['starlark_lib.cannotpossiblybevalid'],",
")");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//bar:skylark_lib");
+ getConfiguredTarget("//bar:starlark_lib");
assertContainsEvent(
"has wrong extension. The list of possible extensions for '" + attrName + "'");
}
@@ -6068,12 +6068,12 @@
scratch.deleteFile("bar/BUILD");
scratch.file(
"bar/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
" " + attrName + " = ['file" + extension + "'],",
")");
- getConfiguredTarget("//bar:skylark_lib");
+ getConfiguredTarget("//bar:starlark_lib");
assertNoEvents();
}
}
@@ -6082,13 +6082,13 @@
setupCcOutputsTest();
scratch.file(
"foo/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
" " + attrName + " = 'object.cannotpossiblybevalid',",
")");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//foo:skylark_lib");
+ getConfiguredTarget("//foo:starlark_lib");
assertContainsEvent(
"has wrong extension. The list of possible extensions for '" + paramName + "'");
}
@@ -6101,12 +6101,12 @@
scratch.deleteFile("foo/BUILD");
scratch.file(
"foo/BUILD",
- "load('//tools/build_defs/foo:extension.bzl', 'cc_skylark_library')",
- "cc_skylark_library(",
- " name = 'skylark_lib',",
+ "load('//tools/build_defs/foo:extension.bzl', 'cc_starlark_library')",
+ "cc_starlark_library(",
+ " name = 'starlark_lib',",
" " + paramName + " = 'object1" + extension + "',",
")");
- getConfiguredTarget("//foo:skylark_lib");
+ getConfiguredTarget("//foo:starlark_lib");
assertNoEvents();
}
}
@@ -6116,7 +6116,7 @@
scratch.file(
"tools/build_defs/foo/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
- "def _cc_skylark_library_impl(ctx):",
+ "def _cc_starlark_library_impl(ctx):",
" objects = []",
" pic_objects = []",
" if ctx.file.object1 != None:",
@@ -6136,8 +6136,8 @@
" compilation_outputs = cc_common.merge_compilation_outputs(",
" compilation_outputs=[c1, c2])",
" return [MyInfo(compilation_outputs=compilation_outputs)]",
- "cc_skylark_library = rule(",
- " implementation = _cc_skylark_library_impl,",
+ "cc_starlark_library = rule(",
+ " implementation = _cc_starlark_library_impl,",
" attrs = {",
" 'object1': attr.label(allow_single_file=True),",
" 'pic_object1': attr.label(allow_single_file=True),",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java
index 6605455..fe08c42 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java
@@ -44,9 +44,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar']",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar']",
")");
assertNoEvents();
@@ -54,13 +54,13 @@
fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
}
@Test
@@ -72,9 +72,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar']",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar']",
")");
assertNoEvents();
@@ -82,14 +82,14 @@
fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib-ijar.jar");
+ .containsExactly("foo/my_starlark_rule_lib-ijar.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib-ijar.jar");
+ .containsExactly("foo/my_starlark_rule_lib-ijar.jar");
}
@Test
@@ -101,9 +101,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
")");
assertNoEvents();
@@ -111,15 +111,15 @@
fetchJavaInfo().getProvider(JavaRuleOutputJarsProvider.class);
assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllSrcOutputJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllClassOutputJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(javaRuleOutputJarsProvider.getOutputJars()).hasSize(1);
OutputJar outputJar = javaRuleOutputJarsProvider.getOutputJars().get(0);
- assertThat(outputJar.getIJar().prettyPrint()).isEqualTo("foo/my_skylark_rule_lib-ijar.jar");
+ assertThat(outputJar.getIJar().prettyPrint()).isEqualTo("foo/my_starlark_rule_lib-ijar.jar");
}
@Test
@@ -129,9 +129,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_direct', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -140,13 +140,13 @@
fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
}
@Test
@@ -156,9 +156,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_direct', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep_runtime = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -167,13 +167,13 @@
fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
}
@Test
@@ -184,9 +184,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_direct', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -195,12 +195,12 @@
fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars())).isEmpty();
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
}
@Test
@@ -209,9 +209,9 @@
scratch.file(
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar']",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar']",
")");
assertNoEvents();
@@ -219,10 +219,10 @@
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
}
@Test
@@ -233,8 +233,8 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
" sources = ['ClassA.java', 'ClassB.java', 'ClassC.java', 'ClassD.java'],",
")");
assertNoEvents();
@@ -243,16 +243,16 @@
fetchJavaInfo().getProvider(JavaRuleOutputJarsProvider.class);
assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllSrcOutputJars()))
- .containsExactly("foo/my_skylark_rule_lib-src.jar");
+ .containsExactly("foo/my_starlark_rule_lib-src.jar");
JavaSourceJarsProvider sourceJarsProvider =
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_lib-src.jar");
+ .containsExactly("foo/my_starlark_rule_lib-src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
- .containsExactly("foo/my_skylark_rule_lib-src.jar");
+ .containsExactly("foo/my_starlark_rule_lib-src.jar");
}
@Test
@@ -263,10 +263,10 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
" sources = ['ClassA.java', 'ClassB.java', 'ClassC.java', 'ClassD.java'],",
- " source_jars = ['my_skylark_rule_src-A.jar']",
+ " source_jars = ['my_starlark_rule_src-A.jar']",
")");
assertNoEvents();
@@ -274,16 +274,16 @@
fetchJavaInfo().getProvider(JavaRuleOutputJarsProvider.class);
assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllSrcOutputJars()))
- .containsExactly("foo/my_skylark_rule_lib-src.jar");
+ .containsExactly("foo/my_starlark_rule_lib-src.jar");
JavaSourceJarsProvider sourceJarsProvider =
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_lib-src.jar");
+ .containsExactly("foo/my_starlark_rule_lib-src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
- .containsExactly("foo/my_skylark_rule_lib-src.jar");
+ .containsExactly("foo/my_starlark_rule_lib-src.jar");
}
@Test
@@ -293,9 +293,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_direct', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -304,10 +304,10 @@
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar", "foo/libmy_java_lib_direct-src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar", "foo/libmy_java_lib_direct-src.jar");
}
@Test
@@ -317,9 +317,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_direct', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep_runtime = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -328,10 +328,10 @@
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar", "foo/libmy_java_lib_direct-src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar", "foo/libmy_java_lib_direct-src.jar");
}
@Test
@@ -344,9 +344,9 @@
"java_library(name = 'my_java_lib_direct',",
" srcs = ['java/A.java'],",
" deps = [':my_java_lib_transitive'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -355,11 +355,11 @@
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
.containsExactly(
- "foo/my_skylark_rule_src.jar",
+ "foo/my_starlark_rule_src.jar",
"foo/libmy_java_lib_direct-src.jar",
"foo/libmy_java_lib_transitive-src.jar");
}
@@ -375,9 +375,9 @@
"java_library(name = 'my_java_lib_direct',",
" srcs = ['java/A.java'],",
" deps = [':my_java_lib_transitive'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep = [':my_java_lib_direct']",
")");
assertNoEvents();
@@ -386,11 +386,11 @@
fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
.containsExactly(
- "foo/my_skylark_rule_src.jar",
+ "foo/my_starlark_rule_src.jar",
"foo/libmy_java_lib_direct-src.jar",
"foo/libmy_java_lib_transitive-src.jar");
}
@@ -402,9 +402,9 @@
scratch.file(
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar']",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar']",
")");
assertNoEvents();
@@ -421,8 +421,8 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_exports', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
" dep_exports = [':my_java_lib_exports']",
")");
assertNoEvents();
@@ -442,13 +442,13 @@
javaInfo.getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
}
/**
@@ -467,8 +467,8 @@
" deps = [':my_java_lib_b', ':my_java_lib_c'],",
" exports = [':my_java_lib_b']",
" )",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
" dep_exports = [':my_java_lib_a']",
")");
assertNoEvents();
@@ -485,24 +485,24 @@
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar",
+ "foo/my_starlark_rule_lib.jar",
"foo/libmy_java_lib_a-hjar.jar",
"foo/libmy_java_lib_b-hjar.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
+ "foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar",
+ "foo/my_starlark_rule_lib.jar",
"foo/libmy_java_lib_a.jar",
"foo/libmy_java_lib_b.jar",
"foo/libmy_java_lib_c.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar",
+ "foo/my_starlark_rule_lib.jar",
"foo/libmy_java_lib_a-hjar.jar",
"foo/libmy_java_lib_b-hjar.jar",
"foo/libmy_java_lib_c-hjar.jar");
@@ -529,8 +529,8 @@
" deps = [':my_java_lib_d'],",
" exports = [':my_java_lib_d']",
" )",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
" dep = [':my_java_lib_a', ':my_java_lib_c'],",
" dep_exports = [':my_java_lib_a']",
")");
@@ -548,17 +548,17 @@
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar",
+ "foo/my_starlark_rule_lib.jar",
"foo/libmy_java_lib_a-hjar.jar",
"foo/libmy_java_lib_b-hjar.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
+ "foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar",
+ "foo/my_starlark_rule_lib.jar",
"foo/libmy_java_lib_a.jar",
"foo/libmy_java_lib_b.jar",
"foo/libmy_java_lib_c.jar",
@@ -566,7 +566,7 @@
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
.containsExactly(
- "foo/my_skylark_rule_lib.jar",
+ "foo/my_starlark_rule_lib.jar",
"foo/libmy_java_lib_a-hjar.jar",
"foo/libmy_java_lib_b-hjar.jar",
"foo/libmy_java_lib_c-hjar.jar",
@@ -597,8 +597,8 @@
" name = 'export',",
" exported_plugins = [ ':plugin'],",
")",
- "my_rule(name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
+ "my_rule(name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
" dep_exports = [':export']",
")");
assertNoEvents();
@@ -620,22 +620,22 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar']",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar']",
")");
assertNoEvents();
JavaCompilationArgsProvider javaCompilationArgsProvider =
fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib-stamped.jar");
+ .containsExactly("foo/my_starlark_rule_lib-stamped.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
- .containsExactly("foo/my_skylark_rule_lib-stamped.jar");
+ .containsExactly("foo/my_starlark_rule_lib-stamped.jar");
}
@Test
@@ -646,9 +646,9 @@
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_direct', srcs = ['java/A.java'])",
"my_rule(",
- " name = 'my_skylark_rule',",
- " output_jar = 'my_skylark_rule_lib.jar',",
- " source_jars = ['my_skylark_rule_src.jar'],",
+ " name = 'my_starlark_rule',",
+ " output_jar = 'my_starlark_rule_lib.jar',",
+ " source_jars = ['my_starlark_rule_src.jar'],",
" dep = [':my_java_lib_direct'],",
" jdeps = 'my_jdeps.pb',",
")");
@@ -662,13 +662,13 @@
ruleOutputs.getOutputJars().stream()
.map(o -> o.getClassJar())
.collect(ImmutableList.toImmutableList())))
- .containsExactly("foo/my_skylark_rule_lib.jar");
+ .containsExactly("foo/my_starlark_rule_lib.jar");
assertThat(
prettyArtifactNames(
ruleOutputs.getOutputJars().stream()
.flatMap(o -> Streams.stream(o.getSrcJars()))
.collect(ImmutableList.toImmutableList())))
- .containsExactly("foo/my_skylark_rule_src.jar");
+ .containsExactly("foo/my_starlark_rule_src.jar");
assertThat(ruleOutputs.getJdeps().prettyPrint()).isEqualTo("foo/my_jdeps.pb");
}
@@ -796,7 +796,7 @@
}
private JavaInfo fetchJavaInfo() throws Exception {
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
index 24b0ded..ed5ff1a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
@@ -1335,9 +1335,9 @@
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_b', srcs = ['java/B.java'])",
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'] , deps = [':my_java_lib_b'])",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
@@ -1365,9 +1365,9 @@
"java_library(name = 'my_java_lib_c', srcs = ['java/C.java'])",
"java_library(name = 'my_java_lib_b', srcs = ['java/B.java'], deps = [':my_java_lib_c'])",
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'], deps = [':my_java_lib_b'])",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
@@ -1398,9 +1398,9 @@
"java_library(name = 'my_java_lib_c', srcs = ['java/C.java'])",
"java_library(name = 'my_java_lib_b', srcs = ['java/B.java'], deps = [':my_java_lib_c'])",
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'], deps = [':my_java_lib_b'])",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
@@ -1431,9 +1431,9 @@
"java_library(name = 'my_java_lib_c', srcs = ['java/C.java'])",
"java_library(name = 'my_java_lib_b', srcs = ['java/B.java'], deps = [':my_java_lib_c'])",
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'], deps = [':my_java_lib_b'])",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
@@ -1464,9 +1464,9 @@
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'], ",
" deps = [':my_java_lib_b', ':my_java_lib_c'], ",
" exports = [':my_java_lib_b']) ",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
@@ -1493,9 +1493,9 @@
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'], ",
" javacopts = ['-processor com.google.process.Processor'])",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
@@ -1523,9 +1523,9 @@
"foo/BUILD",
"load(':extension.bzl', 'my_rule')",
"java_library(name = 'my_java_lib_a', srcs = ['java/A.java'])",
- "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')");
+ "my_rule(name = 'my_starlark_rule', dep = ':my_java_lib_a')");
assertNoEvents();
- ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule");
+ ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_starlark_rule");
StructImpl info =
(StructImpl)
myRuleTarget.get(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryStarlarkApiTest.java
index 4318e8b..c0b3310 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryStarlarkApiTest.java
@@ -57,7 +57,7 @@
scratch.file(
"test_skylark/apple_binary_skylark.bzl",
- "def apple_binary_skylark_impl(ctx):",
+ "def apple_binary_starlark_impl(ctx):",
" binary_output = apple_common.link_multi_arch_binary(ctx=ctx)",
" return [",
" DefaultInfo(",
@@ -67,7 +67,7 @@
" binary_output.debug_outputs_provider",
" ]",
"apple_binary_skylark = rule(",
- " apple_binary_skylark_impl,",
+ " apple_binary_starlark_impl,",
" attrs = {",
" '_child_configuration_dummy': attr.label(",
" cfg=apple_common.multi_arch_split,",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
index 0c909e1..fa81e0a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
@@ -654,22 +654,22 @@
scratch.file("examples/rule/BUILD");
scratch.file(
"examples/rule/apple_rules.bzl",
- "def skylark_static_lib_impl(ctx):",
+ "def starlark_static_lib_impl(ctx):",
" dep_provider = ctx.attr.proxy[apple_common.AppleStaticLibrary]",
" my_provider = apple_common.AppleStaticLibrary(archive = dep_provider.archive,",
" objc = dep_provider.objc)",
" return [my_provider]",
"",
- "skylark_static_lib = rule(",
- " implementation = skylark_static_lib_impl,",
+ "starlark_static_lib = rule(",
+ " implementation = starlark_static_lib_impl,",
" attrs = {'proxy': attr.label()},",
")");
scratch.file(
"examples/apple_skylark/BUILD",
"package(default_visibility = ['//visibility:public'])",
- "load('//examples/rule:apple_rules.bzl', 'skylark_static_lib')",
- "skylark_static_lib(",
+ "load('//examples/rule:apple_rules.bzl', 'starlark_static_lib')",
+ "starlark_static_lib(",
" name='my_target',",
" proxy='//x:x'",
")");
@@ -694,22 +694,22 @@
scratch.file("examples/rule/BUILD");
scratch.file(
"examples/rule/apple_rules.bzl",
- "def skylark_static_lib_impl(ctx):",
+ "def starlark_static_lib_impl(ctx):",
" dep_provider = ctx.attr.proxy[apple_common.AppleStaticLibrary]",
" my_provider = apple_common.AppleStaticLibrary(archive = dep_provider.archive,",
" objc = dep_provider.objc, foo = 'bar')",
" return [my_provider]",
"",
- "skylark_static_lib = rule(",
- " implementation = skylark_static_lib_impl,",
+ "starlark_static_lib = rule(",
+ " implementation = starlark_static_lib_impl,",
" attrs = {'proxy': attr.label()},",
")");
scratch.file(
"examples/apple_skylark/BUILD",
"package(default_visibility = ['//visibility:public'])",
- "load('//examples/rule:apple_rules.bzl', 'skylark_static_lib')",
- "skylark_static_lib(",
+ "load('//examples/rule:apple_rules.bzl', 'starlark_static_lib')",
+ "starlark_static_lib(",
" name='my_target',",
" proxy='//x:x'",
")");
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
index cf2227b..2a3b95c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
@@ -248,10 +248,10 @@
builder.overrideTrimmingTransitionFactoryForTesting(trimmingTransitionFactory);
useRuleClassProvider(builder.build());
scratch.file(
- "a/skylark.bzl",
+ "a/starlark.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'deps': attr.label_list(),",
@@ -260,18 +260,18 @@
")");
scratch.file(
"a/BUILD",
- "load(':skylark.bzl', 'skylark_rule')",
+ "load(':starlark.bzl', 'starlark_rule')",
// ensure that all Starlark rules get the TestConfiguration fragment
"test_base(name = 'base')",
// Starlark rules get trimmed
- "skylark_rule(name = 'skylark_solo', deps = [':base'])",
+ "starlark_rule(name = 'starlark_solo', deps = [':base'])",
// native rules get trimmed; top-level targets get trimmed after the rule-class transition
"add_test_arg_for_self(name = 'test_arg_on_self')",
// deps with dependency transitions get trimmed after the dependency transition
"add_test_arg_for_deps(name = 'attribute_transition', deps = [':dep_after_transition'])",
- "skylark_rule(name = 'dep_after_transition')",
+ "starlark_rule(name = 'dep_after_transition')",
// deps on rule-class transitions get trimmed after the rule-class transition
- "skylark_rule(name = 'dep_on_ruleclass', deps = [':ruleclass_transition'])",
+ "starlark_rule(name = 'dep_on_ruleclass', deps = [':ruleclass_transition'])",
"add_test_arg_for_self(name = 'ruleclass_transition')",
// when all three (rule-class, attribute, trimming transitions) collide it's okay
"add_test_arg_for_deps(name = 'attribute_outer', deps = [':ruleclass_inner'])",
@@ -280,10 +280,10 @@
ConfiguredTarget configuredTarget;
BuildConfiguration config;
- configuredTarget = Iterables.getOnlyElement(update("//a:skylark_solo").getTargetsToBuild());
+ configuredTarget = Iterables.getOnlyElement(update("//a:starlark_solo").getTargetsToBuild());
config = getConfiguration(configuredTarget);
assertThat(config.getFragment(TestConfiguration.class).getTestArguments())
- .containsExactly("trimming transition for //a:skylark_solo");
+ .containsExactly("trimming transition for //a:starlark_solo");
configuredTarget = Iterables.getOnlyElement(update("//a:test_arg_on_self").getTargetsToBuild());
config = getConfiguration(configuredTarget);
@@ -345,10 +345,10 @@
builder.addTrimmingTransitionFactory(secondTrimmingTransitionFactory);
useRuleClassProvider(builder.build());
scratch.file(
- "a/skylark.bzl",
+ "a/starlark.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'deps': attr.label_list(),",
@@ -357,21 +357,21 @@
")");
scratch.file(
"a/BUILD",
- "load(':skylark.bzl', 'skylark_rule')",
+ "load(':starlark.bzl', 'starlark_rule')",
// ensure that all Starlark rules get the TestConfiguration fragment
"test_base(name = 'base')",
// Starlark rules get trimmed
- "skylark_rule(name = 'skylark_solo', deps = [':base'])");
+ "starlark_rule(name = 'starlark_solo', deps = [':base'])");
ConfiguredTarget configuredTarget;
BuildConfiguration config;
- configuredTarget = Iterables.getOnlyElement(update("//a:skylark_solo").getTargetsToBuild());
+ configuredTarget = Iterables.getOnlyElement(update("//a:starlark_solo").getTargetsToBuild());
config = getConfiguration(configuredTarget);
assertThat(config.getFragment(TestConfiguration.class).getTestArguments())
.containsExactly(
- "first trimming transition for //a:skylark_solo",
- "second trimming transition for //a:skylark_solo")
+ "first trimming transition for //a:starlark_solo",
+ "second trimming transition for //a:starlark_solo")
.inOrder();
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceASTFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceASTFunctionTest.java
index 2d3a09c..4ba7471 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceASTFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceASTFunctionTest.java
@@ -81,7 +81,7 @@
@Override
public boolean matches(Object item) {
return super.matches(item)
- && item.toString().equals("PRECOMPUTED:skylark_semantics");
+ && item.toString().equals("PRECOMPUTED:starlark_semantics");
}
})))
.thenReturn(null);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
index 0e59688..a4a9b55 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
@@ -89,7 +89,7 @@
@Test
public void testRemoteLabelAsDefaultAttributeValue() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def _impl(ctx):",
" pass",
"my_rule = rule(implementation = _impl,",
@@ -99,10 +99,10 @@
// to a proper Label without an exception (see GitHub issue #1442).
// Consequently, we expect getTarget() to fail later since the repository does not exist.
checkError(
- "test/skylark",
+ "test/starlark",
"the_rule",
"no such package '@r//': The repository '@r' could not be resolved",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"",
"my_rule(name='the_rule')");
}
@@ -110,17 +110,17 @@
@Test
public void testMainRepoLabelWorkspaceRoot() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" return [MyInfo(result = ctx.label.workspace_root)]",
"my_rule = rule(implementation = _impl, attrs = { })");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"my_rule(name='t')");
- ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:t");
+ ConfiguredTarget myTarget = getConfiguredTarget("//test/starlark:t");
String result = (String) getMyInfoFromTarget(myTarget).getValue("result");
assertThat(result).isEmpty();
}
@@ -136,13 +136,13 @@
scratch.file("/r/WORKSPACE");
scratch.file(
- "/r/test/skylark/extension.bzl",
+ "/r/test/starlark/extension.bzl",
"load('@//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" return [MyInfo(result = ctx.label.workspace_root)]",
"my_rule = rule(implementation = _impl, attrs = { })");
scratch.file(
- "/r/BUILD", "load('//:test/skylark/extension.bzl', 'my_rule')", "my_rule(name='t')");
+ "/r/BUILD", "load('//:test/starlark/extension.bzl', 'my_rule')", "my_rule(name='t')");
// Required since we have a new WORKSPACE file.
invalidatePackages(true);
@@ -163,13 +163,13 @@
scratch.file("/r/WORKSPACE");
scratch.file(
- "/r/test/skylark/extension.bzl",
+ "/r/test/starlark/extension.bzl",
"load('@//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" return [MyInfo(result = ctx.label.workspace_root)]",
"my_rule = rule(implementation = _impl, attrs = { })");
scratch.file(
- "/r/BUILD", "load('//:test/skylark/extension.bzl', 'my_rule')", "my_rule(name='t')");
+ "/r/BUILD", "load('//:test/starlark/extension.bzl', 'my_rule')", "my_rule(name='t')");
// Required since we have a new WORKSPACE file.
invalidatePackages(true);
@@ -187,29 +187,29 @@
// same name. This is perfectly legal as long as these two methods are actually distinct.
// Consequently, no "Recursion was detected" error must be thrown.
scratch.file(
- "test/skylark/extension.bzl",
- "load('//test/skylark:other.bzl', other_impl = 'impl')",
+ "test/starlark/extension.bzl",
+ "load('//test/starlark:other.bzl', other_impl = 'impl')",
"def impl(ctx):",
" other_impl(ctx)",
"empty = rule(implementation = impl)");
- scratch.file("test/skylark/other.bzl", "def impl(ctx):", " print('This rule does nothing')");
+ scratch.file("test/starlark/other.bzl", "def impl(ctx):", " print('This rule does nothing')");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'empty')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'empty')",
"empty(name = 'test_target')");
- getConfiguredTarget("//test/skylark:test_target");
+ getConfiguredTarget("//test/starlark:test_target");
}
private AttributeContainer getContainerForTarget(String targetName) throws Exception {
- ConfiguredTargetAndData target = getConfiguredTargetAndData("//test/skylark:" + targetName);
+ ConfiguredTargetAndData target = getConfiguredTargetAndData("//test/starlark:" + targetName);
return target.getTarget().getAssociatedRule().getAttributeContainer();
}
@Test
public void testMacroHasGeneratorAttributes() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def _impl(ctx):",
" print('This rule does nothing')",
"",
@@ -221,8 +221,8 @@
"def native_macro(name):",
" native.cc_library(name = name + '_suffix')");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', macro_rule = 'macro', no_macro_rule = 'no_macro',",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', macro_rule = 'macro', no_macro_rule = 'no_macro',",
" native_macro_rule = 'native_macro')",
"macro_rule(name = 'macro_target')",
"no_macro_rule(name = 'no_macro_target')",
@@ -233,7 +233,7 @@
AttributeContainer withMacro = getContainerForTarget("macro_target");
assertThat(withMacro.getAttr("generator_name")).isEqualTo("macro_target");
assertThat(withMacro.getAttr("generator_function")).isEqualTo("macro");
- assertThat(withMacro.getAttr("generator_location")).isEqualTo("test/skylark/BUILD:3:11");
+ assertThat(withMacro.getAttr("generator_location")).isEqualTo("test/starlark/BUILD:3:11");
// Attributes are only set when the rule was created by a macro
AttributeContainer noMacro = getContainerForTarget("no_macro_target");
@@ -244,7 +244,7 @@
AttributeContainer nativeMacro = getContainerForTarget("native_macro_target_suffix");
assertThat(nativeMacro.getAttr("generator_name")).isEqualTo("native_macro_target");
assertThat(nativeMacro.getAttr("generator_function")).isEqualTo("native_macro");
- assertThat(nativeMacro.getAttr("generator_location")).isEqualTo("test/skylark/BUILD:5:18");
+ assertThat(nativeMacro.getAttr("generator_location")).isEqualTo("test/starlark/BUILD:5:18");
AttributeContainer ccTarget = getContainerForTarget("cc_target");
assertThat(ccTarget.getAttr("generator_name")).isEqualTo("");
@@ -255,7 +255,7 @@
@Test
public void sanityCheckUserDefinedTestRule() throws Exception {
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _impl(ctx):",
" output = ctx.outputs.out",
" ctx.actions.write(output = output, content = 'hello', is_executable=True)",
@@ -268,16 +268,16 @@
" fragment = 'apple', name = \"xcode_config_label\"))},",
" outputs = {\"out\": \"%{name}.txt\"})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'fake_test')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'fake_test')",
"fake_test(name = 'test_name')");
- getConfiguredTarget("//test/skylark:test_name");
+ getConfiguredTarget("//test/starlark:test_name");
}
@Test
public void testOutputGroupsDeclaredProvider() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" f = ctx.attr.dep[OutputGroupInfo]._hidden_top_level" + INTERNAL_SUFFIX,
@@ -286,14 +286,14 @@
"my_rule = rule(implementation = _impl,",
" attrs = { 'dep' : attr.label() })");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"cc_binary(name = 'lib', data = ['a.txt'])",
"my_rule(name='my', dep = ':lib')");
NestedSet<Artifact> hiddenTopLevelArtifacts =
- OutputGroupInfo.get(getConfiguredTarget("//test/skylark:lib"))
+ OutputGroupInfo.get(getConfiguredTarget("//test/starlark:lib"))
.getOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL);
- ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
+ ConfiguredTarget myTarget = getConfiguredTarget("//test/starlark:my");
Depset result = (Depset) getMyInfoFromTarget(myTarget).getValue("result");
assertThat(result.getSet(Artifact.class).toList())
.containsExactlyElementsIn(hiddenTopLevelArtifacts.toList());
@@ -305,7 +305,7 @@
@Test
public void testOutputGroupsAsDictionary() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" f = ctx.attr.dep.output_groups['_hidden_top_level" + INTERNAL_SUFFIX + "']",
@@ -320,14 +320,14 @@
"my_rule = rule(implementation = _impl,",
" attrs = { 'dep' : attr.label() })");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"cc_binary(name = 'lib', data = ['a.txt'])",
"my_rule(name='my', dep = ':lib')");
NestedSet<Artifact> hiddenTopLevelArtifacts =
- OutputGroupInfo.get(getConfiguredTarget("//test/skylark:lib"))
+ OutputGroupInfo.get(getConfiguredTarget("//test/starlark:lib"))
.getOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL);
- ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
+ ConfiguredTarget myTarget = getConfiguredTarget("//test/starlark:my");
StructImpl myInfo = getMyInfoFromTarget(myTarget);
Depset result = (Depset) myInfo.getValue("result");
assertThat(result.getSet(Artifact.class).toList())
@@ -347,7 +347,7 @@
@Test
public void testOutputGroupsAsDictionaryPipe() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" g = depset(ctx.attr.dep.output_groups['_hidden_top_level" + INTERNAL_SUFFIX + "'])",
@@ -356,14 +356,14 @@
"my_rule = rule(implementation = _impl,",
" attrs = { 'dep' : attr.label() })");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"cc_binary(name = 'lib', data = ['a.txt'])",
"my_rule(name='my', dep = ':lib')");
NestedSet<Artifact> hiddenTopLevelArtifacts =
- OutputGroupInfo.get(getConfiguredTarget("//test/skylark:lib"))
+ OutputGroupInfo.get(getConfiguredTarget("//test/starlark:lib"))
.getOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL);
- ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
+ ConfiguredTarget myTarget = getConfiguredTarget("//test/starlark:my");
Depset result = (Depset) getMyInfoFromTarget(myTarget).getValue("result");
assertThat(result.getSet(Artifact.class).toList())
.containsExactlyElementsIn(hiddenTopLevelArtifacts.toList());
@@ -374,7 +374,7 @@
@Test
public void testOutputGroupsDeclaredProviderWithList() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def _impl(ctx):",
" f = ctx.attr.dep[OutputGroupInfo]._hidden_top_level" + INTERNAL_SUFFIX,
@@ -384,14 +384,14 @@
"my_rule = rule(implementation = _impl,",
" attrs = { 'dep' : attr.label() })");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"cc_binary(name = 'lib', data = ['a.txt'])",
"my_rule(name='my', dep = ':lib')");
NestedSet<Artifact> hiddenTopLevelArtifacts =
- OutputGroupInfo.get(getConfiguredTarget("//test/skylark:lib"))
+ OutputGroupInfo.get(getConfiguredTarget("//test/starlark:lib"))
.getOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL);
- ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
+ ConfiguredTarget myTarget = getConfiguredTarget("//test/starlark:my");
Depset result = (Depset) getMyInfoFromTarget(myTarget).getValue("result");
assertThat(result.getSet(Artifact.class).toList())
.containsExactlyElementsIn(hiddenTopLevelArtifacts.toList());
@@ -424,23 +424,23 @@
Joiner.on(System.lineSeparator())
.join(
"Traceback (most recent call last):",
- "\tFile \"/workspace/test/skylark/BUILD\", line 3",
+ "\tFile \"/workspace/test/starlark/BUILD\", line 3",
"\t\tcustom_rule(name = 'cr')",
- "\tFile \"/workspace/test/skylark/extension.bzl\", line 6, in custom_rule_impl",
+ "\tFile \"/workspace/test/starlark/extension.bzl\", line 6, in custom_rule_impl",
"\t\tfoo()",
- "\tFile \"/workspace/test/skylark/extension.bzl\", line 9, in foo",
+ "\tFile \"/workspace/test/starlark/extension.bzl\", line 9, in foo",
"\t\tbar(2, 4)",
- "\tFile \"/workspace/test/skylark/extension.bzl\", line 11, in bar",
+ "\tFile \"/workspace/test/starlark/extension.bzl\", line 11, in bar",
"\t\tfirst(x, y, z)",
- "\tFile \"/workspace/test/skylark/functions.bzl\", line 2, in first",
+ "\tFile \"/workspace/test/starlark/functions.bzl\", line 2, in first",
"\t\tsecond(a, b)",
- "\tFile \"/workspace/test/skylark/functions.bzl\", line 5, in second",
+ "\tFile \"/workspace/test/starlark/functions.bzl\", line 5, in second",
"\t\tthird(\"legal\")",
- "\tFile \"/workspace/test/skylark/functions.bzl\", line 7, in third",
+ "\tFile \"/workspace/test/starlark/functions.bzl\", line 7, in third",
errorMessage);
scratch.file(
- "test/skylark/extension.bzl",
- "load('//test/skylark:functions.bzl', 'first')",
+ "test/starlark/extension.bzl",
+ "load('//test/starlark:functions.bzl', 'first')",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def custom_rule_impl(ctx):",
" attr1 = ctx.files.attr1",
@@ -454,7 +454,7 @@
"custom_rule = rule(implementation = custom_rule_impl,",
" attrs = {'attr1': attr.label_list(mandatory=True, allow_files=True)})");
scratch.file(
- "test/skylark/functions.bzl",
+ "test/starlark/functions.bzl",
"def first(a, b, c):",
" second(a, b)",
" third(b)",
@@ -463,19 +463,19 @@
"def third(str):",
" " + object + ".index(1)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- getConfiguredTarget("//test/skylark:cr");
+ getConfiguredTarget("//test/starlark:cr");
assertContainsEvent(expectedTrace);
}
@Test
public void testFilesToBuild() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" attr1 = ctx.files.attr1",
" ftb = depset(attr1)",
@@ -485,14 +485,14 @@
" attrs = {'attr1': attr.label_list(mandatory=True, allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
target.getProvider(FileProvider.class).getFilesToBuild()))
@@ -502,7 +502,7 @@
@Test
public void testRunfiles() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" attr1 = ctx.files.attr1",
" rf = ctx.runfiles(files = attr1)",
@@ -512,14 +512,14 @@
" attrs = {'attr1': attr.label_list(mandatory=True, allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
target.getProvider(RunfilesProvider.class).getDefaultRunfiles().getAllArtifacts()))
@@ -533,7 +533,7 @@
@Test
public void testAccessRunfiles() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" runfiles = ctx.attr.x.default_runfiles.files",
" return [DefaultInfo(files = runfiles)]",
@@ -542,22 +542,22 @@
" attrs = {'x': attr.label(allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"cc_library(name = 'lib', data = ['a.txt'])",
"custom_rule(name = 'cr1', x = ':lib')",
"custom_rule(name = 'cr2', x = 'b.txt')");
- scratch.file("test/skylark/a.txt");
- scratch.file("test/skylark/b.txt");
+ scratch.file("test/starlark/a.txt");
+ scratch.file("test/starlark/b.txt");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr1");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr1");
List<String> baseArtifactNames =
ActionsTestUtil.baseArtifactNames(target.getProvider(FileProvider.class).getFilesToBuild());
assertThat(baseArtifactNames).containsExactly("a.txt");
- target = getConfiguredTarget("//test/skylark:cr2");
+ target = getConfiguredTarget("//test/starlark:cr2");
baseArtifactNames =
ActionsTestUtil.baseArtifactNames(target.getProvider(FileProvider.class).getFilesToBuild());
assertThat(baseArtifactNames).isEmpty();
@@ -566,7 +566,7 @@
@Test
public void testStatefulRunfiles() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" attr1 = ctx.files.attr1",
" rf1 = ctx.runfiles(files = attr1)",
@@ -577,14 +577,14 @@
" attrs = {'attr1': attr.label_list(mandatory = True, allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
assertThat(target.getProvider(RunfilesProvider.class).getDefaultRunfiles().isEmpty()).isTrue();
assertThat(
ActionsTestUtil.baseArtifactNames(
@@ -595,7 +595,7 @@
@Test
public void testExecutableGetsInRunfilesAndFilesToBuild() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" ctx.actions.write(output = ctx.outputs.executable, content = 'echo hello')",
" rf = ctx.runfiles(ctx.files.data)",
@@ -605,14 +605,14 @@
" attrs = {'data': attr.label_list(allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', data = [':a.txt'])");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
target.getProvider(RunfilesProvider.class).getDefaultRunfiles().getAllArtifacts()))
@@ -628,7 +628,7 @@
public void testCannotSpecifyRunfilesWithDataOrDefaultRunfiles_struct() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" rf = ctx.runfiles()",
" return struct(runfiles = rf, default_runfiles = rf)",
@@ -636,11 +636,11 @@
"custom_rule = rule(implementation = custom_rule_impl)");
checkError(
- "test/skylark",
+ "test/starlark",
"cr",
"Cannot specify the provider 'runfiles' together with "
+ "'data_runfiles' or 'default_runfiles'",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr')");
}
@@ -648,7 +648,7 @@
@Test
public void testCannotSpecifyRunfilesWithDataOrDefaultRunfiles_defaultInfo() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" rf = ctx.runfiles()",
" return [DefaultInfo(runfiles = rf, default_runfiles = rf)]",
@@ -656,11 +656,11 @@
"custom_rule = rule(implementation = custom_rule_impl)");
checkError(
- "test/skylark",
+ "test/starlark",
"cr",
"Cannot specify the provider 'runfiles' together with "
+ "'data_runfiles' or 'default_runfiles'",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr')");
}
@@ -697,7 +697,7 @@
public void testInstrumentedFilesProviderWithCodeCoverageDisabled() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct(instrumented_files=struct(",
" extensions = ['txt'],",
@@ -710,17 +710,17 @@
" 'attr2': attr.label_list(mandatory = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"java_library(name='jl', srcs = [':A.java'])",
"custom_rule(name = 'cr', attr1 = [':a.txt', ':a.random'], attr2 = [':jl'])");
useConfiguration("--nocollect_code_coverage");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
InstrumentedFilesInfo provider = target.get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR);
assertWithMessage("InstrumentedFilesInfo should be set.").that(provider).isNotNull();
assertThat(ActionsTestUtil.baseArtifactNames(provider.getInstrumentedFiles())).isEmpty();
@@ -730,7 +730,7 @@
public void testInstrumentedFilesProviderWithCodeCoverageEnabled() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct(instrumented_files=struct(",
" extensions = ['txt'],",
@@ -743,17 +743,17 @@
" 'attr2': attr.label_list(mandatory = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"java_library(name='jl', srcs = [':A.java'])",
"custom_rule(name = 'cr', attr1 = [':a.txt', ':a.random'], attr2 = [':jl'])");
useConfiguration("--collect_code_coverage");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
InstrumentedFilesInfo provider = target.get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR);
assertWithMessage("InstrumentedFilesInfo should be set.").that(provider).isNotNull();
assertThat(ActionsTestUtil.baseArtifactNames(provider.getInstrumentedFiles()))
@@ -764,7 +764,7 @@
public void testInstrumentedFilesInfo_coverageDisabled() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct(instrumented_files=struct(",
" extensions = ['txt'],",
@@ -777,15 +777,15 @@
" 'attr2': attr.label_list(mandatory = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"java_library(name='jl', srcs = [':A.java'])",
"custom_rule(name = 'cr', attr1 = [':a.txt', ':a.random'], attr2 = [':jl'])");
useConfiguration("--nocollect_code_coverage");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
InstrumentedFilesInfo provider = target.get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR);
assertWithMessage("InstrumentedFilesInfo should be set.").that(provider).isNotNull();
@@ -835,7 +835,7 @@
@Test
public void testTransitiveInfoProviders() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def custom_rule_impl(ctx):",
" attr1 = ctx.files.attr1",
@@ -846,12 +846,12 @@
" attrs = {'attr1': attr.label_list(mandatory=True, allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- RuleConfiguredTarget target = (RuleConfiguredTarget) getConfiguredTarget("//test/skylark:cr");
+ RuleConfiguredTarget target = (RuleConfiguredTarget) getConfiguredTarget("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
@@ -919,9 +919,9 @@
@Test
public void testMandatoryProviderMissing() throws Exception {
- scratch.file("test/skylark/BUILD");
+ scratch.file("test/starlark/BUILD");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def rule_impl(ctx):",
" return []",
"",
@@ -936,8 +936,8 @@
"b",
"in dependencies attribute of main_rule rule //test:b: "
+ "'//test:a' does not have mandatory providers: 'some_provider'",
- "load('//test/skylark:extension.bzl', 'dependent_rule')",
- "load('//test/skylark:extension.bzl', 'main_rule')",
+ "load('//test/starlark:extension.bzl', 'dependent_rule')",
+ "load('//test/starlark:extension.bzl', 'main_rule')",
"",
"dependent_rule(name = 'a')",
"main_rule(name = 'b', dependencies = [':a'])");
@@ -952,11 +952,11 @@
"bind(name = 'bar', actual = '//test/ext:bar')");
scratch.file(
"test/ext/BUILD",
- "load('//test/skylark:extension.bzl', 'foobar')",
+ "load('//test/starlark:extension.bzl', 'foobar')",
"",
"foobar(name = 'bar', visibility = ['//visibility:public'],)");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def rule_impl(ctx):",
" pass",
"",
@@ -968,20 +968,20 @@
" ])",
"})");
scratch.file(
- "test/skylark/BUILD",
+ "test/starlark/BUILD",
"load(':extension.bzl', 'foobar', 'main_rule')",
"",
"foobar(name = 'foo')",
"main_rule(name = 'main', deps = [':foo', '//external:bar'])");
invalidatePackages();
- getConfiguredTarget("//test/skylark:main");
+ getConfiguredTarget("//test/starlark:main");
}
@Test
public void testActions() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" attr1 = ctx.files.attr1",
" output = ctx.outputs.o",
@@ -995,14 +995,14 @@
" outputs = {'o': 'o.txt'})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- getConfiguredTarget("//test/skylark:cr");
+ getConfiguredTarget("//test/starlark:cr");
- FileConfiguredTarget target = getFileConfiguredTarget("//test/skylark:o.txt");
+ FileConfiguredTarget target = getFileConfiguredTarget("//test/starlark:o.txt");
assertThat(
ActionsTestUtil.baseArtifactNames(
getGeneratingAction(target.getArtifact()).getInputs()))
@@ -1012,7 +1012,7 @@
@Test
public void testRuleClassImplicitOutputFunction() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" files = [ctx.outputs.o]",
" ctx.actions.run_shell(",
@@ -1031,12 +1031,12 @@
" outputs = output_func)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', public_attr = 'bar')");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
@@ -1047,7 +1047,7 @@
@Test
public void testRuleClassImplicitOutputFunctionDependingOnComputedAttribute() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" files = [ctx.outputs.o]",
" ctx.actions.run_shell(",
@@ -1073,13 +1073,13 @@
"empty_rule = rule(implementation = empty_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule', 'empty_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule', 'empty_rule')",
"",
"empty_rule(name = 'foo')",
- "custom_rule(name = 'cr', public_attr = '//test/skylark:foo')");
+ "custom_rule(name = 'cr', public_attr = '//test/starlark:foo')");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
@@ -1090,7 +1090,7 @@
@Test
public void testRuleClassImplicitOutputs() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" files = [ctx.outputs.lbl, ctx.outputs.list, ctx.outputs.str]",
" print('==!=!=!=')",
@@ -1113,8 +1113,8 @@
"})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(",
" name='cr',",
@@ -1123,11 +1123,11 @@
" attr3='f3.txt',",
")");
- scratch.file("test/skylark/f1.txt");
- scratch.file("test/skylark/f2.txt");
- scratch.file("test/skylark/f3.txt");
+ scratch.file("test/starlark/f1.txt");
+ scratch.file("test/starlark/f2.txt");
+ scratch.file("test/starlark/f3.txt");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
target.getProvider(FileProvider.class).getFilesToBuild()))
@@ -1137,7 +1137,7 @@
@Test
public void testRuleClassImplicitOutputFunctionAndDefaultValue() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" ctx.actions.run_shell(",
" outputs = [ctx.outputs.o],",
@@ -1152,12 +1152,12 @@
" outputs = output_func)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = None)");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
@@ -1168,7 +1168,7 @@
@Test
public void testPrintProviderCollection() throws Exception {
scratch.file(
- "test/skylark/rules.bzl",
+ "test/starlark/rules.bzl",
"",
"FooInfo = provider()",
"BarInfo = provider()",
@@ -1193,22 +1193,22 @@
")");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:rules.bzl', 'top_level_rule', 'dep_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:rules.bzl', 'top_level_rule', 'dep_rule')",
"",
"top_level_rule(name = 'tl', my_dep=':d')",
"",
"dep_rule(name = 'd')");
- getConfiguredTarget("//test/skylark:tl");
+ getConfiguredTarget("//test/starlark:tl");
assertContainsEvent(
- "My Dep Providers: <target //test/skylark:d, keys:[FooInfo, BarInfo, OutputGroupInfo]>");
+ "My Dep Providers: <target //test/starlark:d, keys:[FooInfo, BarInfo, OutputGroupInfo]>");
}
@Test
public void testRuleClassImplicitOutputFunctionPrints() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" print('implementation', ctx.label)",
" files = [ctx.outputs.o]",
@@ -1224,14 +1224,14 @@
" outputs = output_func)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr')");
- getConfiguredTarget("//test/skylark:cr");
+ getConfiguredTarget("//test/starlark:cr");
assertContainsEvent("output function cr");
- assertContainsEvent("implementation //test/skylark:cr");
+ assertContainsEvent("implementation //test/starlark:cr");
}
@Test
@@ -1245,7 +1245,7 @@
" return [MyInfo(o1=ctx.attr._o1)]",
"",
"def output_fn():",
- " return Label('//test/skylark:foo.txt')",
+ " return Label('//test/starlark:foo.txt')",
"",
"custom_rule = rule(implementation = custom_rule_impl,",
" attrs = {'_o1': attr.output(default = output_fn)})");
@@ -1285,7 +1285,7 @@
@Test
public void testRuleClassNonMandatoryEmptyOutputs() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"load('//myinfo:myinfo.bzl', 'MyInfo')",
"def custom_rule_impl(ctx):",
" return [MyInfo(",
@@ -1296,12 +1296,12 @@
" attrs = {'o1': attr.output(), 'o2': attr.output_list()})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr')");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
StructImpl myInfo = getMyInfoFromTarget(target);
assertThat(myInfo.getValue("o1")).isEqualTo(Starlark.NONE);
assertThat(myInfo.getValue("o2")).isEqualTo(StarlarkList.empty());
@@ -1310,7 +1310,7 @@
@Test
public void testRuleClassImplicitAndExplicitOutputNamesCollide() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return []",
"",
@@ -1319,10 +1319,10 @@
" outputs = {'o': '%{name}.txt'})");
checkError(
- "test/skylark",
+ "test/starlark",
"cr",
"Multiple outputs with the same key: o",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', o = [':bar.txt'])");
}
@@ -1330,7 +1330,7 @@
@Test
public void testRuleClassDefaultFilesToBuild() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" files = [ctx.outputs.o]",
" ctx.actions.run_shell(",
@@ -1351,12 +1351,12 @@
" outputs = output_func)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = 'bar', out=['other'])");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
@@ -1483,29 +1483,29 @@
public void testRecursionDetection() throws Exception {
reporter.removeHandler(failFastHandler);
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def _impl(ctx):",
" _impl(ctx)",
"empty = rule(implementation = _impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'empty')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'empty')",
"empty(name = 'test_target')");
- getConfiguredTarget("//test/skylark:test_target");
+ getConfiguredTarget("//test/starlark:test_target");
assertContainsEvent("function '_impl' called recursively");
}
@Test
public void testBadCallbackFunction() throws Exception {
scratch.file(
- "test/skylark/extension.bzl", "def impl(): return 0", "", "custom_rule = rule(impl)");
+ "test/starlark/extension.bzl", "def impl(): return 0", "", "custom_rule = rule(impl)");
checkError(
- "test/skylark",
+ "test/starlark",
"cr",
"impl() does not accept positional arguments",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr')");
}
@@ -1513,7 +1513,7 @@
@Test
public void testRuleClassImplicitOutputFunctionBadAttr() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return None",
"",
@@ -1525,10 +1525,10 @@
" outputs = output_func)");
checkError(
- "test/skylark",
+ "test/starlark",
"cr",
"Attribute 'bad_attr' either doesn't exist or uses a select()",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = 'bar')");
}
@@ -1536,7 +1536,7 @@
@Test
public void testHelperFunctionInRuleImplementation() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def helper_func(attr1):",
" return depset(attr1)",
"",
@@ -1549,14 +1549,14 @@
" attrs = {'attr1': attr.label_list(mandatory=True, allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr', attr1 = [':a.txt'])");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:cr");
- assertThat(target.getLabel().toString()).isEqualTo("//test/skylark:cr");
+ assertThat(target.getLabel().toString()).isEqualTo("//test/starlark:cr");
assertThat(
ActionsTestUtil.baseArtifactNames(
target.getProvider(FileProvider.class).getFilesToBuild()))
@@ -1565,9 +1565,9 @@
@Test
public void testMultipleLoadsOfSameRule() throws Exception {
- scratch.file("test/skylark/BUILD");
+ scratch.file("test/starlark/BUILD");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return None",
"",
@@ -1575,138 +1575,139 @@
" attrs = {'dep': attr.label_list(allow_files=True)})");
scratch.file(
- "test/skylark1/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark1/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"custom_rule(name = 'cr1')");
scratch.file(
- "test/skylark2/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
- "custom_rule(name = 'cr2', dep = ['//test/skylark1:cr1'])");
+ "test/starlark2/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
+ "custom_rule(name = 'cr2', dep = ['//test/starlark1:cr1'])");
- getConfiguredTarget("//test/skylark2:cr2");
+ getConfiguredTarget("//test/starlark2:cr2");
}
@Test
public void testFunctionGeneratingRules() throws Exception {
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def impl(ctx): return None",
"def gen(): return rule(impl)",
"r = gen()",
"s = gen()");
scratch.file(
- "test/skylark/BUILD", "load(':extension.bzl', 'r', 's')", "r(name = 'r')", "s(name = 's')");
+ "test/starlark/BUILD", "load(':extension.bzl', 'r', 's')",
+ "r(name = 'r')", "s(name = 's')");
- getConfiguredTarget("//test/skylark:r");
- getConfiguredTarget("//test/skylark:s");
+ getConfiguredTarget("//test/starlark:r");
+ getConfiguredTarget("//test/starlark:s");
}
@Test
public void testLoadInStarlark() throws Exception {
- scratch.file("test/skylark/implementation.bzl", "def custom_rule_impl(ctx):", " return None");
+ scratch.file("test/starlark/implementation.bzl", "def custom_rule_impl(ctx):", " return None");
scratch.file(
- "test/skylark/extension.bzl",
- "load('//test/skylark:implementation.bzl', 'custom_rule_impl')",
+ "test/starlark/extension.bzl",
+ "load('//test/starlark:implementation.bzl', 'custom_rule_impl')",
"",
"custom_rule = rule(implementation = custom_rule_impl,",
" attrs = {'dep': attr.label_list(allow_files=True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"custom_rule(name = 'cr')");
- getConfiguredTarget("//test/skylark:cr");
+ getConfiguredTarget("//test/starlark:cr");
}
@Test
public void testRuleAliasing() throws Exception {
scratch.file(
- "test/skylark/implementation.bzl",
+ "test/starlark/implementation.bzl",
"def impl(ctx): return []",
"custom_rule = rule(implementation = impl)");
scratch.file(
- "test/skylark/ext.bzl",
- "load('//test/skylark:implementation.bzl', 'custom_rule')",
+ "test/starlark/ext.bzl",
+ "load('//test/starlark:implementation.bzl', 'custom_rule')",
"def impl(ctx): return []",
"custom_rule1 = rule(implementation = impl)",
"custom_rule2 = custom_rule1",
"custom_rule3 = custom_rule");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:ext.bzl', 'custom_rule1', 'custom_rule2', 'custom_rule3')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:ext.bzl', 'custom_rule1', 'custom_rule2', 'custom_rule3')",
"custom_rule4 = custom_rule3",
"custom_rule1(name = 'cr1')",
"custom_rule2(name = 'cr2')",
"custom_rule3(name = 'cr3')",
"custom_rule4(name = 'cr4')");
- getConfiguredTarget("//test/skylark:cr1");
- getConfiguredTarget("//test/skylark:cr2");
- getConfiguredTarget("//test/skylark:cr3");
- getConfiguredTarget("//test/skylark:cr4");
+ getConfiguredTarget("//test/starlark:cr1");
+ getConfiguredTarget("//test/starlark:cr2");
+ getConfiguredTarget("//test/starlark:cr3");
+ getConfiguredTarget("//test/starlark:cr4");
}
@Test
public void testRecursiveLoad() throws Exception {
- scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext1.bzl', 'symbol2')");
+ scratch.file("test/starlark/ext2.bzl", "load('//test/starlark:ext1.bzl', 'symbol2')");
- scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol1')");
+ scratch.file("test/starlark/ext1.bzl", "load('//test/starlark:ext2.bzl', 'symbol1')");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:ext1.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:ext1.bzl', 'custom_rule')",
"genrule(name = 'rule')");
reporter.removeHandler(failFastHandler);
- assertThrows(BuildFileContainsErrorsException.class, () -> getTarget("//test/skylark:rule"));
+ assertThrows(BuildFileContainsErrorsException.class, () -> getTarget("//test/starlark:rule"));
assertContainsEvent(
"cycle detected in extension files: \n"
- + " test/skylark/BUILD\n"
- + ".-> //test/skylark:ext1.bzl\n"
- + "| //test/skylark:ext2.bzl\n"
- + "`-- //test/skylark:ext1.bzl");
+ + " test/starlark/BUILD\n"
+ + ".-> //test/starlark:ext1.bzl\n"
+ + "| //test/starlark:ext2.bzl\n"
+ + "`-- //test/starlark:ext1.bzl");
}
@Test
public void testRecursiveLoad2() throws Exception {
- scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol2')");
- scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext3.bzl', 'symbol3')");
- scratch.file("test/skylark/ext3.bzl", "load('//test/skylark:ext4.bzl', 'symbol4')");
- scratch.file("test/skylark/ext4.bzl", "load('//test/skylark:ext2.bzl', 'symbol2')");
+ scratch.file("test/starlark/ext1.bzl", "load('//test/starlark:ext2.bzl', 'symbol2')");
+ scratch.file("test/starlark/ext2.bzl", "load('//test/starlark:ext3.bzl', 'symbol3')");
+ scratch.file("test/starlark/ext3.bzl", "load('//test/starlark:ext4.bzl', 'symbol4')");
+ scratch.file("test/starlark/ext4.bzl", "load('//test/starlark:ext2.bzl', 'symbol2')");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:ext1.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:ext1.bzl', 'custom_rule')",
"genrule(name = 'rule')");
reporter.removeHandler(failFastHandler);
- assertThrows(BuildFileContainsErrorsException.class, () -> getTarget("//test/skylark:rule"));
+ assertThrows(BuildFileContainsErrorsException.class, () -> getTarget("//test/starlark:rule"));
assertContainsEvent(
"cycle detected in extension files: \n"
- + " test/skylark/BUILD\n"
- + " //test/skylark:ext1.bzl\n"
- + ".-> //test/skylark:ext2.bzl\n"
- + "| //test/skylark:ext3.bzl\n"
- + "| //test/skylark:ext4.bzl\n"
- + "`-- //test/skylark:ext2.bzl");
+ + " test/starlark/BUILD\n"
+ + " //test/starlark:ext1.bzl\n"
+ + ".-> //test/starlark:ext2.bzl\n"
+ + "| //test/starlark:ext3.bzl\n"
+ + "| //test/starlark:ext4.bzl\n"
+ + "`-- //test/starlark:ext2.bzl");
}
@Test
public void testLoadSymbolTypo() throws Exception {
- scratch.file("test/skylark/ext1.bzl", "myvariable = 2");
+ scratch.file("test/starlark/ext1.bzl", "myvariable = 2");
- scratch.file("test/skylark/BUILD", "load('//test/skylark:ext1.bzl', 'myvariables')");
+ scratch.file("test/starlark/BUILD", "load('//test/starlark:ext1.bzl', 'myvariables')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:test_target");
+ getConfiguredTarget("//test/starlark:test_target");
assertContainsEvent(
- "file '//test/skylark:ext1.bzl' does not contain symbol 'myvariables' "
+ "file '//test/starlark:ext1.bzl' does not contain symbol 'myvariables' "
+ "(did you mean 'myvariable'?)");
}
@@ -1997,7 +1998,7 @@
// for a bug where a Starlark rule with unsatisfied constraints but explicit providers would
// result in Bazel throwing a null pointer exception.
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"MyProvider = provider()",
"",
"def _impl(ctx):",
@@ -2006,15 +2007,15 @@
" attrs = { 'deps' : attr.label_list() },",
" provides = [MyProvider])");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'my_rule')",
"java_library(name = 'dep', srcs = ['a.java'], restricted_to = ['//buildenv/foo:other'])",
"my_rule(name='my', deps = [':dep'])");
reporter.removeHandler(failFastHandler);
- assertThat(getConfiguredTarget("//test/skylark:my")).isNull();
+ assertThat(getConfiguredTarget("//test/starlark:my")).isNull();
assertContainsEvent(
- "//test/skylark:dep doesn't support expected environment: //buildenv/foo:default");
+ "//test/starlark:dep doesn't support expected environment: //buildenv/foo:default");
}
@Test
@@ -2825,19 +2826,19 @@
public void testDisallowStructProviderSyntax() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=true");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct()",
"",
"custom_rule = rule(implementation = custom_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'cr')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:cr");
+ getConfiguredTarget("//test/starlark:cr");
assertContainsEvent(
"Returning a struct from a rule implementation function is deprecated and will be "
+ "removed soon. It may be temporarily re-enabled by setting "
@@ -2848,7 +2849,7 @@
public void testDisableTargetProviderFields() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disable_target_provider_fields=true");
scratch.file(
- "test/skylark/rule.bzl",
+ "test/starlark/rule.bzl",
"MyProvider = provider()",
"",
"def _my_rule_impl(ctx): ",
@@ -2863,14 +2864,14 @@
" })",
"dep_rule = rule(implementation = _dep_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
+ "test/starlark/BUILD",
"load(':rule.bzl', 'my_rule', 'dep_rule')",
"",
"my_rule(name = 'r', dep = ':d')",
"dep_rule(name = 'd')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:r");
+ getConfiguredTarget("//test/starlark:r");
assertContainsEvent(
"Accessing providers via the field syntax on structs is deprecated and will be removed "
+ "soon. It may be temporarily re-enabled by setting "
@@ -2884,7 +2885,7 @@
public void testDisableTargetProviderFields_actionsField() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disable_target_provider_fields=true");
scratch.file(
- "test/skylark/rule.bzl",
+ "test/starlark/rule.bzl",
"MyProvider = provider()",
"",
"def _my_rule_impl(ctx): ",
@@ -2899,20 +2900,20 @@
" })",
"dep_rule = rule(implementation = _dep_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
+ "test/starlark/BUILD",
"load(':rule.bzl', 'my_rule', 'dep_rule')",
"",
"my_rule(name = 'r', dep = ':d')",
"dep_rule(name = 'd')");
- assertThat(getConfiguredTarget("//test/skylark:r")).isNotNull();
+ assertThat(getConfiguredTarget("//test/starlark:r")).isNotNull();
}
@Test
public void testDisableTargetProviderFields_disabled() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disable_target_provider_fields=false");
scratch.file(
- "test/skylark/rule.bzl",
+ "test/starlark/rule.bzl",
"MyProvider = provider()",
"",
"def _my_rule_impl(ctx): ",
@@ -2927,20 +2928,20 @@
" })",
"dep_rule = rule(implementation = _dep_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
+ "test/starlark/BUILD",
"load(':rule.bzl', 'my_rule', 'dep_rule')",
"",
"my_rule(name = 'r', dep = ':d')",
"dep_rule(name = 'd')");
- assertThat(getConfiguredTarget("//test/skylark:r")).isNotNull();
+ assertThat(getConfiguredTarget("//test/starlark:r")).isNotNull();
}
@Test
public void testNoRuleOutputsParam() throws Exception {
setStarlarkSemanticsOptions("--incompatible_no_rule_outputs_param=true");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _impl(ctx):",
" output = ctx.outputs.out",
" ctx.actions.write(output = output, content = 'hello')",
@@ -2949,12 +2950,12 @@
" implementation = _impl,",
" outputs = {\"out\": \"%{name}.txt\"})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:target");
+ getConfiguredTarget("//test/starlark:target");
assertContainsEvent(
"parameter 'outputs' is deprecated and will be removed soon. It may be temporarily "
+ "re-enabled by setting --incompatible_no_rule_outputs_param=false");
@@ -2964,7 +2965,7 @@
public void testExecutableNotInRunfiles() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" exe = ctx.actions.declare_file('exe')",
" ctx.actions.run_shell(outputs=[exe], command='touch exe')",
@@ -2973,12 +2974,12 @@
" return struct(executable = exe, default_runfiles = ctx.runfiles(files = [runfile]))",
"my_rule = rule(implementation = _my_rule_impl, executable = True)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:target");
+ getConfiguredTarget("//test/starlark:target");
assertContainsEvent("exe not included in runfiles");
}
@@ -2986,19 +2987,19 @@
public void testCommandStringList() throws Exception {
setStarlarkSemanticsOptions("--incompatible_run_shell_command_string");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" exe = ctx.actions.declare_file('exe')",
" ctx.actions.run_shell(outputs=[exe], command=['touch', 'exe'])",
" return []",
"my_rule = rule(implementation = _my_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:target");
+ getConfiguredTarget("//test/starlark:target");
assertContainsEvent("'command' must be of type string");
}
@@ -3014,46 +3015,46 @@
@Override
@Test
public void testRecursiveLoad() throws Exception {
- scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext1.bzl', 'symbol2')");
+ scratch.file("test/starlark/ext2.bzl", "load('//test/starlark:ext1.bzl', 'symbol2')");
- scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol1')");
+ scratch.file("test/starlark/ext1.bzl", "load('//test/starlark:ext2.bzl', 'symbol1')");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:ext1.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:ext1.bzl', 'custom_rule')",
"genrule(name = 'rule')");
reporter.removeHandler(failFastHandler);
BuildFileContainsErrorsException e =
assertThrows(
- BuildFileContainsErrorsException.class, () -> getTarget("//test/skylark:rule"));
+ BuildFileContainsErrorsException.class, () -> getTarget("//test/starlark:rule"));
assertThat(e)
.hasMessageThat()
- .contains("Starlark load cycle: [//test/skylark:ext1.bzl, //test/skylark:ext2.bzl]");
+ .contains("Starlark load cycle: [//test/starlark:ext1.bzl, //test/starlark:ext2.bzl]");
}
@Override
@Test
public void testRecursiveLoad2() throws Exception {
- scratch.file("test/skylark/ext1.bzl", "load('//test/skylark:ext2.bzl', 'symbol2')");
- scratch.file("test/skylark/ext2.bzl", "load('//test/skylark:ext3.bzl', 'symbol3')");
- scratch.file("test/skylark/ext3.bzl", "load('//test/skylark:ext4.bzl', 'symbol4')");
- scratch.file("test/skylark/ext4.bzl", "load('//test/skylark:ext2.bzl', 'symbol2')");
+ scratch.file("test/starlark/ext1.bzl", "load('//test/starlark:ext2.bzl', 'symbol2')");
+ scratch.file("test/starlark/ext2.bzl", "load('//test/starlark:ext3.bzl', 'symbol3')");
+ scratch.file("test/starlark/ext3.bzl", "load('//test/starlark:ext4.bzl', 'symbol4')");
+ scratch.file("test/starlark/ext4.bzl", "load('//test/starlark:ext2.bzl', 'symbol2')");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:ext1.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:ext1.bzl', 'custom_rule')",
"genrule(name = 'rule')");
reporter.removeHandler(failFastHandler);
BuildFileContainsErrorsException e =
assertThrows(
- BuildFileContainsErrorsException.class, () -> getTarget("//test/skylark:rule"));
+ BuildFileContainsErrorsException.class, () -> getTarget("//test/starlark:rule"));
assertThat(e)
.hasMessageThat()
.contains(
- "Starlark load cycle: [//test/skylark:ext2.bzl, "
- + "//test/skylark:ext3.bzl, //test/skylark:ext4.bzl]");
+ "Starlark load cycle: [//test/starlark:ext2.bzl, "
+ + "//test/starlark:ext3.bzl, //test/starlark:ext4.bzl]");
}
}
@@ -3191,17 +3192,17 @@
@Test
public void testNoOutputsError() throws Exception {
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" ctx.actions.run_shell(outputs=[], command='foo')",
"my_rule = rule(implementation = _my_rule_impl, executable = True)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:target");
+ getConfiguredTarget("//test/starlark:target");
assertContainsEvent("param 'outputs' may not be empty");
}
@@ -3212,7 +3213,7 @@
scratch.file("test/dep/BUILD", "exports_files(['test_file.txt'])");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" exe = ctx.actions.declare_file('exe', sibling = ctx.file.dep)",
" ctx.actions.run_shell(outputs=[exe], command=['touch', 'exe'])",
@@ -3220,15 +3221,15 @@
"my_rule = rule(implementation = _my_rule_impl,",
" attrs = {'dep': attr.label(allow_single_file = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target', dep = '//test/dep:test_file.txt')");
reporter.removeHandler(failFastHandler);
- getConfiguredTarget("//test/skylark:target");
+ getConfiguredTarget("//test/starlark:target");
assertContainsEvent(
"the output artifact 'test/dep/exe' is not under package directory "
- + "'test/skylark' for target '//test/skylark:target'");
+ + "'test/starlark' for target '//test/starlark:target'");
}
@Test
@@ -3238,7 +3239,7 @@
scratch.file("test/dep/BUILD", "exports_files(['test_file.txt'])");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" exe = ctx.actions.declare_file('/foo/exe')",
" ctx.actions.run_shell(outputs=[exe], command=['touch', 'exe'])",
@@ -3246,15 +3247,15 @@
"my_rule = rule(implementation = _my_rule_impl,",
" attrs = {'dep': attr.label(allow_single_file = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target', dep = '//test/dep:test_file.txt')");
reporter.removeHandler(failFastHandler);
- assertThat(getConfiguredTarget("//test/skylark:target")).isNull();
+ assertThat(getConfiguredTarget("//test/starlark:target")).isNull();
assertContainsEvent(
"the output artifact '/foo/exe' is not under package directory "
- + "'test/skylark' for target '//test/skylark:target'");
+ + "'test/starlark' for target '//test/starlark:target'");
}
@Test
@@ -3264,7 +3265,7 @@
scratch.file("test/dep/BUILD", "exports_files(['test_file.txt'])");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" exe = ctx.actions.declare_directory('/foo/exe', sibling = ctx.file.dep)",
" ctx.actions.run_shell(outputs=[exe], command=['touch', 'exe'])",
@@ -3272,15 +3273,15 @@
"my_rule = rule(implementation = _my_rule_impl,",
" attrs = {'dep': attr.label(allow_single_file = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target', dep = '//test/dep:test_file.txt')");
reporter.removeHandler(failFastHandler);
- assertThat(getConfiguredTarget("//test/skylark:target")).isNull();
+ assertThat(getConfiguredTarget("//test/starlark:target")).isNull();
assertContainsEvent(
"the output directory '/foo/exe' is not under package directory "
- + "'test/skylark' for target '//test/skylark:target'");
+ + "'test/starlark' for target '//test/starlark:target'");
}
@Test
@@ -3290,7 +3291,7 @@
scratch.file("test/dep/BUILD", "exports_files(['test_file.txt'])");
scratch.file(
- "test/skylark/test_rule.bzl",
+ "test/starlark/test_rule.bzl",
"def _my_rule_impl(ctx):",
" exe = ctx.actions.declare_directory('/foo/exe')",
" ctx.actions.run_shell(outputs=[exe], command=['touch', 'exe'])",
@@ -3298,34 +3299,34 @@
"my_rule = rule(implementation = _my_rule_impl,",
" attrs = {'dep': attr.label(allow_single_file = True)})");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:test_rule.bzl', 'my_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:test_rule.bzl', 'my_rule')",
"my_rule(name = 'target', dep = '//test/dep:test_file.txt')");
reporter.removeHandler(failFastHandler);
- assertThat(getConfiguredTarget("//test/skylark:target")).isNull();
+ assertThat(getConfiguredTarget("//test/starlark:target")).isNull();
assertContainsEvent(
"the output directory '/foo/exe' is not under package directory "
- + "'test/skylark' for target '//test/skylark:target'");
+ + "'test/starlark' for target '//test/starlark:target'");
}
@Test
public void testLegacyProvider_AddCanonicalLegacyKeyAndModernKey() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct(foo = apple_common.new_objc_provider(define=depset(['foo'])))",
"",
"custom_rule = rule(implementation = custom_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'test')");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:test");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:test");
ObjcProvider providerFromModernKey = target.get(ObjcProvider.STARLARK_CONSTRUCTOR);
ObjcProvider providerFromObjc = (ObjcProvider) target.get("objc");
@@ -3341,7 +3342,7 @@
public void testLegacyProvider_DontAutomaticallyAddKeysAlreadyPresent() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct(providers = [apple_common.new_objc_provider(define=depset(['prov']))],",
" bah = apple_common.new_objc_provider(define=depset(['bah'])),",
@@ -3350,12 +3351,12 @@
"custom_rule = rule(implementation = custom_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'test')");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:test");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:test");
ObjcProvider providerFromModernKey = target.get(ObjcProvider.STARLARK_CONSTRUCTOR);
ObjcProvider providerFromObjc = (ObjcProvider) target.get("objc");
@@ -3370,7 +3371,7 @@
public void testLegacyProvider_FirstNoncanonicalKeyBecomesCanonical() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
scratch.file(
- "test/skylark/extension.bzl",
+ "test/starlark/extension.bzl",
"def custom_rule_impl(ctx):",
" return struct(providers = [apple_common.new_objc_provider(define=depset(['prov']))],",
" foo = apple_common.new_objc_provider(define=depset(['foo'])),",
@@ -3379,12 +3380,12 @@
"custom_rule = rule(implementation = custom_rule_impl)");
scratch.file(
- "test/skylark/BUILD",
- "load('//test/skylark:extension.bzl', 'custom_rule')",
+ "test/starlark/BUILD",
+ "load('//test/starlark:extension.bzl', 'custom_rule')",
"",
"custom_rule(name = 'test')");
- ConfiguredTarget target = getConfiguredTarget("//test/skylark:test");
+ ConfiguredTarget target = getConfiguredTarget("//test/starlark:test");
ObjcProvider providerFromModernKey = target.get(ObjcProvider.STARLARK_CONSTRUCTOR);
ObjcProvider providerFromObjc = (ObjcProvider) target.get("objc");
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
index c2a5b02..d8be9a7 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
@@ -157,21 +157,22 @@
private void setUpAttributeErrorTest() throws Exception {
scratch.file(
"test/BUILD",
- "load('//test:macros.bzl', 'macro_native_rule', 'macro_skylark_rule', 'skylark_rule')",
+ "load('//test:macros.bzl', 'macro_native_rule', 'macro_starlark_rule', 'starlark_rule')",
"macro_native_rule(name = 'm_native',",
" deps = [':jlib'])",
- "macro_skylark_rule(name = 'm_skylark',",
+ "macro_starlark_rule(name = 'm_skylark',",
" deps = [':jlib'])",
"java_library(name = 'jlib',",
" srcs = ['bla.java'])",
"cc_library(name = 'cclib',",
" deps = [':jlib'])",
- "skylark_rule(name = 'skyrule',",
+ "starlark_rule(name = 'skyrule',",
" deps = [':jlib'])");
- scratch.file("test/macros.bzl",
+ scratch.file(
+ "test/macros.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'deps': attr.label_list(providers = ['some_provider'], allow_files=True)",
@@ -179,8 +180,8 @@
")",
"def macro_native_rule(name, deps): ",
" native.cc_library(name = name, deps = deps)",
- "def macro_skylark_rule(name, deps):",
- " skylark_rule(name = name, deps = deps)");
+ "def macro_starlark_rule(name, deps):",
+ " starlark_rule(name = name, deps = deps)");
reporter.removeHandler(failFastHandler);
}
@@ -202,10 +203,10 @@
setUpAttributeErrorTest();
assertThrows(Exception.class, () -> createRuleContext("//test:m_skylark"));
assertContainsEvent(
- "ERROR /workspace/test/BUILD:4:19: in deps attribute of skylark_rule rule "
+ "ERROR /workspace/test/BUILD:4:20: in deps attribute of starlark_rule rule "
+ "//test:m_skylark: '//test:jlib' does not have mandatory providers:"
+ " 'some_provider'. "
- + "Since this rule was created by the macro 'macro_skylark_rule', the error might "
+ + "Since this rule was created by the macro 'macro_starlark_rule', the error might "
+ "have been caused by the macro implementation");
}
@@ -224,49 +225,51 @@
setUpAttributeErrorTest();
assertThrows(Exception.class, () -> createRuleContext("//test:skyrule"));
assertContainsEvent(
- "ERROR /workspace/test/BUILD:10:13: in deps attribute of "
- + "skylark_rule rule //test:skyrule: '//test:jlib' does not have mandatory providers: "
+ "ERROR /workspace/test/BUILD:10:14: in deps attribute of "
+ + "starlark_rule rule //test:skyrule: '//test:jlib' does not have mandatory providers: "
+ "'some_provider'");
}
@Test
public void testMandatoryProvidersListWithStarlark() throws Exception {
setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false");
- scratch.file("test/BUILD",
- "load('//test:rules.bzl', 'skylark_rule', 'my_rule', 'my_other_rule')",
- "my_rule(name = 'mylib',",
- " srcs = ['a.py'])",
- "skylark_rule(name = 'skyrule1',",
- " deps = [':mylib'])",
- "my_other_rule(name = 'my_other_lib',",
- " srcs = ['a.py'])",
- "skylark_rule(name = 'skyrule2',",
- " deps = [':my_other_lib'])");
- scratch.file("test/rules.bzl",
- "def _impl(ctx):",
- " return",
- "skylark_rule = rule(",
- " implementation = _impl,",
- " attrs = {",
- " 'deps': attr.label_list(providers = [['a'], ['b', 'c']],",
- " allow_files=True)",
- " }",
- ")",
- "def my_rule_impl(ctx):",
- " return struct(a = [])",
- "my_rule = rule(implementation = my_rule_impl, ",
- " attrs = { 'srcs' : attr.label_list(allow_files=True)})",
- "def my_other_rule_impl(ctx):",
- " return struct(b = [])",
- "my_other_rule = rule(implementation = my_other_rule_impl, ",
- " attrs = { 'srcs' : attr.label_list(allow_files=True)})");
+ scratch.file(
+ "test/BUILD",
+ "load('//test:rules.bzl', 'starlark_rule', 'my_rule', 'my_other_rule')",
+ "my_rule(name = 'mylib',",
+ " srcs = ['a.py'])",
+ "starlark_rule(name = 'skyrule1',",
+ " deps = [':mylib'])",
+ "my_other_rule(name = 'my_other_lib',",
+ " srcs = ['a.py'])",
+ "starlark_rule(name = 'skyrule2',",
+ " deps = [':my_other_lib'])");
+ scratch.file(
+ "test/rules.bzl",
+ "def _impl(ctx):",
+ " return",
+ "starlark_rule = rule(",
+ " implementation = _impl,",
+ " attrs = {",
+ " 'deps': attr.label_list(providers = [['a'], ['b', 'c']],",
+ " allow_files=True)",
+ " }",
+ ")",
+ "def my_rule_impl(ctx):",
+ " return struct(a = [])",
+ "my_rule = rule(implementation = my_rule_impl, ",
+ " attrs = { 'srcs' : attr.label_list(allow_files=True)})",
+ "def my_other_rule_impl(ctx):",
+ " return struct(b = [])",
+ "my_other_rule = rule(implementation = my_other_rule_impl, ",
+ " attrs = { 'srcs' : attr.label_list(allow_files=True)})");
reporter.removeHandler(failFastHandler);
assertThat(getConfiguredTarget("//test:skyrule1")).isNotNull();
assertThrows(Exception.class, () -> createRuleContext("//test:skyrule2"));
assertContainsEvent(
- "ERROR /workspace/test/BUILD:8:13: in deps attribute of "
- + "skylark_rule rule //test:skyrule2: '//test:my_other_lib' does not have "
+ "ERROR /workspace/test/BUILD:8:14: in deps attribute of "
+ + "starlark_rule rule //test:skyrule2: '//test:my_other_lib' does not have "
+ "mandatory providers: 'a' or 'c'");
}
@@ -319,16 +322,18 @@
@Test
public void testPackageBoundaryError_StarlarkRule() throws Exception {
- scratch.file("test/BUILD",
- "load('//test:macros.bzl', 'skylark_rule')",
- "skylark_rule(name = 'skyrule',",
+ scratch.file(
+ "test/BUILD",
+ "load('//test:macros.bzl', 'starlark_rule')",
+ "starlark_rule(name = 'skyrule',",
" srcs = ['sub/my_sub_lib.h'])");
scratch.file("test/sub/BUILD",
"cc_library(name = 'my_sub_lib', srcs = ['my_sub_lib.h'])");
- scratch.file("test/macros.bzl",
+ scratch.file(
+ "test/macros.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'srcs': attr.label_list(allow_files=True)",
@@ -337,34 +342,36 @@
reporter.removeHandler(failFastHandler);
getConfiguredTarget("//test:skyrule");
assertContainsEvent(
- "ERROR /workspace/test/BUILD:2:13: Label '//test:sub/my_sub_lib.h' is invalid because "
+ "ERROR /workspace/test/BUILD:2:14: Label '//test:sub/my_sub_lib.h' is invalid because "
+ "'test/sub' is a subpackage; perhaps you meant to put the colon here: "
+ "'//test/sub:my_sub_lib.h'?");
}
@Test
public void testPackageBoundaryError_StarlarkMacro() throws Exception {
- scratch.file("test/BUILD",
- "load('//test:macros.bzl', 'macro_skylark_rule')",
- "macro_skylark_rule(name = 'm_skylark',",
+ scratch.file(
+ "test/BUILD",
+ "load('//test:macros.bzl', 'macro_starlark_rule')",
+ "macro_starlark_rule(name = 'm_skylark',",
" srcs = ['sub/my_sub_lib.h'])");
scratch.file("test/sub/BUILD",
"cc_library(name = 'my_sub_lib', srcs = ['my_sub_lib.h'])");
- scratch.file("test/macros.bzl",
+ scratch.file(
+ "test/macros.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'srcs': attr.label_list(allow_files=True)",
" }",
")",
- "def macro_skylark_rule(name, srcs=[]):",
- " skylark_rule(name = name, srcs = srcs)");
+ "def macro_starlark_rule(name, srcs=[]):",
+ " starlark_rule(name = name, srcs = srcs)");
reporter.removeHandler(failFastHandler);
getConfiguredTarget("//test:m_skylark");
assertContainsEvent(
- "ERROR /workspace/test/BUILD:2:19: Label '//test:sub/my_sub_lib.h' is invalid because"
+ "ERROR /workspace/test/BUILD:2:20: Label '//test:sub/my_sub_lib.h' is invalid because"
+ " 'test/sub' is a subpackage; perhaps you meant to put the colon here: "
+ "'//test/sub:my_sub_lib.h'?");
}
@@ -421,26 +428,28 @@
*/
@Test
public void testPackageBoundaryError_StarlarkMacroWithErrorInBzlFile() throws Exception {
- scratch.file("test/BUILD",
- "load('//test:macros.bzl', 'macro_skylark_rule')",
- "macro_skylark_rule(name = 'm_skylark')");
+ scratch.file(
+ "test/BUILD",
+ "load('//test:macros.bzl', 'macro_starlark_rule')",
+ "macro_starlark_rule(name = 'm_skylark')");
scratch.file("test/sub/BUILD",
"cc_library(name = 'my_sub_lib', srcs = ['my_sub_lib.h'])");
- scratch.file("test/macros.bzl",
+ scratch.file(
+ "test/macros.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'srcs': attr.label_list(allow_files=True)",
" }",
")",
- "def macro_skylark_rule(name, srcs=[]):",
- " skylark_rule(name = name, srcs = srcs + ['sub/my_sub_lib.h'])");
+ "def macro_starlark_rule(name, srcs=[]):",
+ " starlark_rule(name = name, srcs = srcs + ['sub/my_sub_lib.h'])");
reporter.removeHandler(failFastHandler);
getConfiguredTarget("//test:m_skylark");
assertContainsEvent(
- "ERROR /workspace/test/BUILD:2:19: Label '//test:sub/my_sub_lib.h' "
+ "ERROR /workspace/test/BUILD:2:20: Label '//test:sub/my_sub_lib.h' "
+ "is invalid because 'test/sub' is a subpackage");
}
@@ -1567,7 +1576,7 @@
"test/rule.bzl",
"def _impl(ctx):",
" return",
- "skylark_rule = rule(",
+ "starlark_rule = rule(",
" implementation = _impl,",
" attrs = {",
" 'dep': attr.label(),",
@@ -1575,11 +1584,11 @@
")");
scratch.file(
"test/BUILD",
- "load('//test:rule.bzl', 'skylark_rule')",
+ "load('//test:rule.bzl', 'starlark_rule')",
"py_binary(name = 'lib', srcs = ['lib.py', 'lib2.py'])",
- "skylark_rule(name = 'foo', dep = ':lib')",
+ "starlark_rule(name = 'foo', dep = ':lib')",
"py_binary(name = 'lib_with_init', srcs = ['lib_with_init.py', 'lib2.py', '__init__.py'])",
- "skylark_rule(name = 'foo_with_init', dep = ':lib_with_init')");
+ "starlark_rule(name = 'foo_with_init', dep = ':lib_with_init')");
setRuleContext(createRuleContext("//test:foo"));
Object filenames =
@@ -1917,7 +1926,8 @@
setStarlarkSemanticsOptions(
"--incompatible_disallow_struct_provider_syntax=false",
"--incompatible_no_rule_outputs_param=false");
- scratch.file("test/rules.bzl",
+ scratch.file(
+ "test/rules.bzl",
"def _undertest_impl(ctx):",
" out1 = ctx.outputs.out1",
" out2 = ctx.outputs.out2",
@@ -1966,7 +1976,8 @@
// But we need to inspect the result of calling created_actions() after the rule context has
// been modified by creating actions. So we'll call created_actions() from within the analysis
// function and pass it along as a provider.
- scratch.file("test/rules.bzl",
+ scratch.file(
+ "test/rules.bzl",
"def _undertest_impl(ctx):",
" out1 = ctx.outputs.out1",
" out2 = ctx.outputs.out2",
@@ -1981,8 +1992,7 @@
" 'out2': '%{name}2.txt'},",
" _skylark_testable = True,",
")",
- testingRuleDefinition
- );
+ testingRuleDefinition);
scratch.file("test/BUILD",
simpleBuildDefinition);
StarlarkRuleContext ruleContext = createRuleContext("//test:testing");
@@ -2238,7 +2248,8 @@
@Test
public void testTemplateExpansionActionInterface() throws Exception {
- scratch.file("test/rules.bzl",
+ scratch.file(
+ "test/rules.bzl",
"def _undertest_impl(ctx):",
" out = ctx.outputs.out",
" ctx.actions.expand_template(output=out,",
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ResolverTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ResolverTest.java
index 87227f5..100dd13 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ResolverTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ResolverTest.java
@@ -283,10 +283,10 @@
"def rule(*, implementation): return None", //
"def impl(ctx): return None",
"",
- "skylark_rule = rule(implementation = impl)",
+ "starlark_rule = rule(implementation = impl)",
"",
"def macro(name):",
- " skylark_rule(name = name)");
+ " starlark_rule(name = name)");
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkEvaluationTest.java
index 0781d8f..2c733a8 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkEvaluationTest.java
@@ -1940,7 +1940,7 @@
static final NativeProvider<StarlarkStructWithStarlarkMethods> CONSTRUCTOR =
new NativeProvider<StarlarkStructWithStarlarkMethods>(
- StarlarkStructWithStarlarkMethods.class, "struct_with_skylark_callables") {};
+ StarlarkStructWithStarlarkMethods.class, "struct_with_starlark_callables") {};
// A function that returns "fromValues".
Object returnFromValues =
@@ -2054,7 +2054,7 @@
.update("val", new StarlarkStructWithStarlarkMethods())
.testIfExactError(
// TODO(bazel-team): This should probably list callable_only_method as well.
- "'struct_with_skylark_callables' value has no field or method 'nonexistent_field'\n"
+ "'struct_with_starlark_callables' value has no field or method 'nonexistent_field'\n"
+ "Available attributes: callable_only_field, collision_field, collision_method, "
+ "values_only_field, values_only_method",
"v = val.nonexistent_field");
@@ -2065,7 +2065,7 @@
new Scenario()
.update("val", new StarlarkStructWithStarlarkMethods())
.testIfExactError(
- "'struct_with_skylark_callables' value has no field or method 'nonexistent_method'\n"
+ "'struct_with_starlark_callables' value has no field or method 'nonexistent_method'\n"
+ "Available attributes: callable_only_field, collision_field, collision_method, "
+ "values_only_field, values_only_method",
"v = val.nonexistent_method()");
