From 72e559d0fcea55d329b4eaafb84410625ce5165e Mon Sep 17 00:00:00 2001 From: gregce Date: Wed, 12 Aug 2020 12:10:14 -0700 Subject: [PATCH] The great Skylark -> Starlark class migration: Replace all known remaining references* *Except java_rules_skylark.bzl. This is depended on in third_party/jformatstring (https://github.com/bazelbuild/bazel/blob/a8353612b4791531ae4e2ed463cf0e5d8a4009e8/third_party/jformatstring/BUILD#L17), so breaking the dependency is a bit more complex. I'm excluding as part of this migration project: - "skylark" in URLs. We can't just break URLs. And our docs generation pipeline may bake in assumptions. This would have to be its own docs effort. - "skylark-lang", etc. build targets that alandonovan@ is migrating to java.net.starlark. - --skylark_* builds flags. Changing these without warning is higher risk since we don't know who uses these flags for what. These should go through their own dedicated migration processes. PiperOrigin-RevId: 326283275 --- examples/BUILD | 2 +- examples/java-skylark/BUILD | 10 --- examples/java-starlark/BUILD | 10 +++ .../{java-skylark => java-starlark}/README.md | 0 .../src/main/java/com/example/myproject/BUILD | 2 +- .../java/com/example/myproject/Greeter.java | 2 +- .../src/main/resources/BUILD | 0 .../src/main/resources/greeting.txt | 0 .../src/test/java/com/example/myproject/BUILD | 4 +- .../test/java/com/example/myproject/Fail.java | 0 .../java/com/example/myproject/TestHello.java | 0 .../com/google/devtools/build/buildjar/BUILD | 4 +- .../devtools/build/buildjar/genclass/BUILD | 2 +- .../devtools/build/buildjar/jarhelper/BUILD | 2 +- .../build/buildjar/javac/plugins/BUILD | 2 +- .../com/google/devtools/build/singlejar/BUILD | 6 +- .../devtools/build/lib/rules/objc/README.md | 2 +- .../com/google/devtools/build/lib/shell/BUILD | 2 +- .../lib/analysis/StarlarkExecGroupTest.java | 2 +- .../lib/rules/objc/ObjcStarlarkTest.java | 14 ++-- .../syntax/StarlarkInterfaceUtilsTest.java | 2 +- src/test/py/bazel/action_temp_test.py | 10 +-- src/test/shell/bazel/bazel_example_test.sh | 10 +-- src/test/shell/bazel/bazel_execlog_test.sh | 8 +- src/test/shell/bazel/bazel_java_test.sh | 8 +- .../bazel/bazel_repository_cache_test.sh | 26 +++---- src/test/shell/bazel/bazel_sandboxing_test.sh | 40 +++++----- .../bazel/external_starlark_load_test.sh | 24 +++--- src/test/shell/bazel/maven_starlark_test.sh | 14 ++-- .../remote/remote_execution_http_test.sh | 22 +++--- .../bazel/remote/remote_execution_test.sh | 14 ++-- .../shell/bazel/starlark_repository_test.sh | 76 +++++++++---------- src/test/shell/bazel/starlark_rule_test.sh | 8 +- .../bazel/tags_propagation_starlark_test.sh | 16 ++-- src/test/shell/bazel/workspace_test.sh | 2 +- src/test/shell/integration/aquery_test.sh | 2 +- .../shell/integration/bazel_query_test.sh | 22 +++--- .../integration/modify_execution_info_test.sh | 6 +- src/test/shell/integration/outputs_test.sh | 2 +- src/test/shell/testenv.sh | 2 +- 40 files changed, 190 insertions(+), 190 deletions(-) delete mode 100644 examples/java-skylark/BUILD create mode 100644 examples/java-starlark/BUILD rename examples/{java-skylark => java-starlark}/README.md (100%) rename examples/{java-skylark => java-starlark}/src/main/java/com/example/myproject/BUILD (88%) rename examples/{java-skylark => java-starlark}/src/main/java/com/example/myproject/Greeter.java (93%) rename examples/{java-skylark => java-starlark}/src/main/resources/BUILD (100%) rename examples/{java-skylark => java-starlark}/src/main/resources/greeting.txt (100%) rename examples/{java-skylark => java-starlark}/src/test/java/com/example/myproject/BUILD (76%) rename examples/{java-skylark => java-starlark}/src/test/java/com/example/myproject/Fail.java (100%) rename examples/{java-skylark => java-starlark}/src/test/java/com/example/myproject/TestHello.java (100%) diff --git a/examples/BUILD b/examples/BUILD index b33cb8ab32a188..7053aeb9ff6651 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -7,7 +7,7 @@ filegroup( "//examples/cpp:srcs", "//examples/gen:srcs", "//examples/java-native:srcs", - "//examples/java-skylark:srcs", + "//examples/java-starlark:srcs", "//examples/py:srcs", "//examples/py_native:srcs", "//examples/shell:srcs", diff --git a/examples/java-skylark/BUILD b/examples/java-skylark/BUILD deleted file mode 100644 index 74541aede1487f..00000000000000 --- a/examples/java-skylark/BUILD +++ /dev/null @@ -1,10 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "srcs", - srcs = glob(["**"]) + [ - "//examples/java-skylark/src/main/java/com/example/myproject:srcs", - "//examples/java-skylark/src/main/resources:srcs", - "//examples/java-skylark/src/test/java/com/example/myproject:srcs", - ], -) diff --git a/examples/java-starlark/BUILD b/examples/java-starlark/BUILD new file mode 100644 index 00000000000000..0d291318560ea1 --- /dev/null +++ b/examples/java-starlark/BUILD @@ -0,0 +1,10 @@ +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "srcs", + srcs = glob(["**"]) + [ + "//examples/java-starlark/src/main/java/com/example/myproject:srcs", + "//examples/java-starlark/src/main/resources:srcs", + "//examples/java-starlark/src/test/java/com/example/myproject:srcs", + ], +) diff --git a/examples/java-skylark/README.md b/examples/java-starlark/README.md similarity index 100% rename from examples/java-skylark/README.md rename to examples/java-starlark/README.md diff --git a/examples/java-skylark/src/main/java/com/example/myproject/BUILD b/examples/java-starlark/src/main/java/com/example/myproject/BUILD similarity index 88% rename from examples/java-skylark/src/main/java/com/example/myproject/BUILD rename to examples/java-starlark/src/main/java/com/example/myproject/BUILD index 3483840ce3ec9f..22f426287e08f2 100644 --- a/examples/java-skylark/src/main/java/com/example/myproject/BUILD +++ b/examples/java-starlark/src/main/java/com/example/myproject/BUILD @@ -17,7 +17,7 @@ java_binary( java_library( name = "hello-lib", srcs = ["Greeter.java"], - data = ["//examples/java-skylark/src/main/resources:greeting"], + data = ["//examples/java-starlark/src/main/resources:greeting"], ) filegroup( diff --git a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java b/examples/java-starlark/src/main/java/com/example/myproject/Greeter.java similarity index 93% rename from examples/java-skylark/src/main/java/com/example/myproject/Greeter.java rename to examples/java-starlark/src/main/java/com/example/myproject/Greeter.java index 143a71dfd43cb3..54aaa1ded67fc9 100644 --- a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java +++ b/examples/java-starlark/src/main/java/com/example/myproject/Greeter.java @@ -30,7 +30,7 @@ public void hello(String obj) throws Exception { String greeting = "Hello"; try { String greetFile = getRunfiles() - + "/io_bazel/examples/java-skylark/src/main/resources/greeting.txt"; + + "/io_bazel/examples/java-starlark/src/main/resources/greeting.txt"; greeting = convertStreamToString(new FileInputStream(greetFile)); } catch (FileNotFoundException e) { // use default. diff --git a/examples/java-skylark/src/main/resources/BUILD b/examples/java-starlark/src/main/resources/BUILD similarity index 100% rename from examples/java-skylark/src/main/resources/BUILD rename to examples/java-starlark/src/main/resources/BUILD diff --git a/examples/java-skylark/src/main/resources/greeting.txt b/examples/java-starlark/src/main/resources/greeting.txt similarity index 100% rename from examples/java-skylark/src/main/resources/greeting.txt rename to examples/java-starlark/src/main/resources/greeting.txt diff --git a/examples/java-skylark/src/test/java/com/example/myproject/BUILD b/examples/java-starlark/src/test/java/com/example/myproject/BUILD similarity index 76% rename from examples/java-skylark/src/test/java/com/example/myproject/BUILD rename to examples/java-starlark/src/test/java/com/example/myproject/BUILD index 0257d24d8c02d4..c03924f7a7ff2c 100644 --- a/examples/java-skylark/src/test/java/com/example/myproject/BUILD +++ b/examples/java-starlark/src/test/java/com/example/myproject/BUILD @@ -10,7 +10,7 @@ java_test( srcs = ["TestHello.java"], deps = [ ":junit4", - "//examples/java-skylark/src/main/java/com/example/myproject:hello-lib", + "//examples/java-starlark/src/main/java/com/example/myproject:hello-lib", ], ) @@ -23,5 +23,5 @@ java_test( filegroup( name = "srcs", srcs = glob(["**/*.java"]) + ["BUILD"], - visibility = ["//examples/java-skylark:__pkg__"], + visibility = ["//examples/java-starlark:__pkg__"], ) diff --git a/examples/java-skylark/src/test/java/com/example/myproject/Fail.java b/examples/java-starlark/src/test/java/com/example/myproject/Fail.java similarity index 100% rename from examples/java-skylark/src/test/java/com/example/myproject/Fail.java rename to examples/java-starlark/src/test/java/com/example/myproject/Fail.java diff --git a/examples/java-skylark/src/test/java/com/example/myproject/TestHello.java b/examples/java-starlark/src/test/java/com/example/myproject/TestHello.java similarity index 100% rename from examples/java-skylark/src/test/java/com/example/myproject/TestHello.java rename to examples/java-starlark/src/test/java/com/example/myproject/TestHello.java diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD index e2189d7b0064b7..1bf1bd7a802010 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD @@ -154,7 +154,7 @@ java_library( # bootstrap_java_library( - name = "skylark-deps", + name = "starlark-deps", srcs = ["//:bootstrap-derived-java-srcs"], jars = [ "//third_party:auto_value-jars", @@ -199,7 +199,7 @@ bootstrap_java_binary( main_class = "com.google.devtools.build.buildjar.VanillaJavaBuilder", tags = ["manual"], deps = [ - ":skylark-deps", + ":starlark-deps", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:bootstrap_jarhelper", ], ) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD index 118537f23ad154..0a6eada249de9f 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD @@ -41,7 +41,7 @@ bootstrap_java_binary( main_class = "com.google.devtools.build.buildjar.genclass.GenClass", tags = ["manual"], deps = [ - "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:skylark-deps", + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:starlark-deps", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:bootstrap_jarhelper", ], ) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD index c3145b81e4f880..3b3ac3be0977a8 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD @@ -30,6 +30,6 @@ bootstrap_java_library( ], tags = ["manual"], deps = [ - "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:skylark-deps", + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:starlark-deps", ], ) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD index 59131bf227ef10..ba50689f35c32e 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD @@ -81,6 +81,6 @@ bootstrap_java_library( deps = [ "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_JarOwner", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_invalid_command_line_exception", - "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:skylark-deps", + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:starlark-deps", ], ) diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD index dcd68cc74966e4..b6349019423a3c 100644 --- a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD +++ b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD @@ -74,7 +74,7 @@ java_binary( # bootstrap_java_library( - name = "skylark-deps", + name = "starlark-deps", jars = [ "//third_party:jsr305-jars", ], @@ -96,7 +96,7 @@ bootstrap_java_binary( tags = ["manual"], visibility = ["//visibility:public"], deps = [ - ":skylark-deps", - "//src/main/java/com/google/devtools/build/lib/shell:shell-skylark", + ":starlark-deps", + "//src/main/java/com/google/devtools/build/lib/shell:shell-starlark", ], ) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/README.md b/src/main/java/com/google/devtools/build/lib/rules/objc/README.md index ca4f216ca0d4b8..e3a8f7852c6564 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/README.md +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/README.md @@ -26,7 +26,7 @@ build information (that is, information that cannot always be derived strictly from BUILD files). The contents of these configurations can be inspected by looking at `rules/objc/ObjcConfiguration.java` and `rules/apple/AppleConfiguration.java`. To access a configuration fragment from -skylark, the fragment must be declared in the rule definition: +Starlark, the fragment must be declared in the rule definition: ``` def __impl(ctx): diff --git a/src/main/java/com/google/devtools/build/lib/shell/BUILD b/src/main/java/com/google/devtools/build/lib/shell/BUILD index 8208a609c56cc6..fe60ea4a797120 100644 --- a/src/main/java/com/google/devtools/build/lib/shell/BUILD +++ b/src/main/java/com/google/devtools/build/lib/shell/BUILD @@ -29,7 +29,7 @@ java_library( load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library") bootstrap_java_library( - name = "shell-skylark", + name = "shell-starlark", srcs = glob( ["*.java"], exclude = ["ExecutionStatistics.java"], diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java index c627395a566756..0eb0c764ad1bff 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java @@ -33,7 +33,7 @@ /** * Test for exec groups. Functionality related to rule context tested in {@link - * com.google.devtools.build.lib.skylark.StarlarkRuleContextTest}. + * com.google.devtools.build.lib.starlark.StarlarkRuleContextTest}. */ @RunWith(JUnit4.class) public class StarlarkExecGroupTest extends BuildViewTestCase { diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java index 1b0355a8f91db9..8251a89248e79a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java @@ -1314,7 +1314,7 @@ public void testStarlarkCanCreateObjcProviderWithStrictDepsPreMigration() throws .containsExactly(PathFragment.create("path1")); scratch.file( - "examples/objc_skylark2/BUILD", + "examples/objc_starlark2/BUILD", "objc_library(", " name = 'direct_dep',", " deps = ['//examples/objc_starlark:my_target']", @@ -1325,13 +1325,13 @@ public void testStarlarkCanCreateObjcProviderWithStrictDepsPreMigration() throws ")"); ObjcProvider starlarkProviderDirectDepender = - getConfiguredTarget("//examples/objc_skylark2:direct_dep") + getConfiguredTarget("//examples/objc_starlark2:direct_dep") .get(ObjcProvider.STARLARK_CONSTRUCTOR); assertThat(starlarkProviderDirectDepender.include()) .containsExactly(PathFragment.create("path2")); ObjcProvider starlarkProviderIndirectDepender = - getConfiguredTarget("//examples/objc_skylark2:indirect_dep") + getConfiguredTarget("//examples/objc_starlark2:indirect_dep") .get(ObjcProvider.STARLARK_CONSTRUCTOR); assertThat(starlarkProviderIndirectDepender.include()) .containsExactly(PathFragment.create("path2")); @@ -1358,14 +1358,14 @@ public void testStarlarkCanCreateObjcProviderWithStrictDepsPostMigration() throw .containsExactly(PathFragment.create("path1")); scratch.file( - "examples/objc_skylark2/BUILD", + "examples/objc_starlark2/BUILD", "objc_library(", " name = 'direct_dep',", " deps = ['//examples/objc_starlark:my_target']", ")"); ObjcProvider starlarkProviderDirectDepender = - getConfiguredTarget("//examples/objc_skylark2:direct_dep") + getConfiguredTarget("//examples/objc_starlark2:direct_dep") .get(ObjcProvider.STARLARK_CONSTRUCTOR); assertThat(starlarkProviderDirectDepender.include()).isEmpty(); } @@ -1384,14 +1384,14 @@ public void testStarlarkCanCreateObjcProviderWithStrictDepsDirectly() throws Exc .containsExactly(PathFragment.create("path")); scratch.file( - "examples/objc_skylark2/BUILD", + "examples/objc_starlark2/BUILD", "objc_library(", " name = 'direct_dep',", " deps = ['//examples/objc_starlark:my_target']", ")"); ObjcProvider starlarkProviderDirectDepender = - getConfiguredTarget("//examples/objc_skylark2:direct_dep") + getConfiguredTarget("//examples/objc_starlark2:direct_dep") .get(ObjcProvider.STARLARK_CONSTRUCTOR); assertThat(starlarkProviderDirectDepender.getStrictDependencyIncludes()).isEmpty(); } diff --git a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkInterfaceUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkInterfaceUtilsTest.java index a0b1bae14abb32..7d5afa2974d6c9 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkInterfaceUtilsTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkInterfaceUtilsTest.java @@ -87,7 +87,7 @@ public void foo() {} } /** - * A mock class that implements two unrelated module interfaces. This is invalid as the skylark + * A mock class that implements two unrelated module interfaces. This is invalid as the Starlark * type of such an object is ambiguous. */ public static class ImplementsTwoUnrelatedInterfaceModules diff --git a/src/test/py/bazel/action_temp_test.py b/src/test/py/bazel/action_temp_test.py index d72f2368a7f089..8eb3f57368bb16 100644 --- a/src/test/py/bazel/action_temp_test.py +++ b/src/test/py/bazel/action_temp_test.py @@ -94,7 +94,7 @@ def _AssertTempDir(self, self.assertEqual(len(outputs), 2) self._AssertOutputFileContents(outputs['genrule'], input_file_contents, expected_tmpdir_regex) - self._AssertOutputFileContents(outputs['skylark'], input_file_contents, + self._AssertOutputFileContents(outputs['starlark'], input_file_contents, expected_tmpdir_regex) def _UpdateInputFile(self, content): @@ -189,7 +189,7 @@ def _CreateWorkspace(self, build_flags=None): ')', '', 'foorule(', - ' name = "skylark",', + ' name = "starlark",', ' src = "input.txt",', ' tool = "%s",' % toolname, ')', @@ -224,16 +224,16 @@ def _ReadFile(path): '--verbose_failures', '--spawn_strategy=%s' % strategy, '//foo:genrule', - '//foo:skylark', + '//foo:starlark', ], env_remove, env_add) self.AssertExitCode(exit_code, 0, stderr) self.assertTrue( os.path.exists(os.path.join(bazel_genfiles, 'foo/genrule.txt'))) - self.assertTrue(os.path.exists(os.path.join(bazel_bin, 'foo/skylark.txt'))) + self.assertTrue(os.path.exists(os.path.join(bazel_bin, 'foo/starlark.txt'))) return { 'genrule': _ReadFile(os.path.join(bazel_genfiles, 'foo/genrule.txt')), - 'skylark': _ReadFile(os.path.join(bazel_bin, 'foo/skylark.txt')) + 'starlark': _ReadFile(os.path.join(bazel_bin, 'foo/starlark.txt')) } def _AssertOutputFileContents(self, lines, input_file_line, diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh index 401e54afba87a2..8f0ed8d1f83789 100755 --- a/src/test/shell/bazel/bazel_example_test.sh +++ b/src/test/shell/bazel/bazel_example_test.sh @@ -166,8 +166,8 @@ function test_python() { expect_log "Hello" } -function test_java_skylark() { - local java_pkg=examples/java-skylark/src/main/java/com/example/myproject +function test_java_starlark() { + local java_pkg=examples/java-starlark/src/main/java/com/example/myproject assert_build_output ./bazel-bin/${java_pkg}/libhello-lib.jar ${java_pkg}:hello-lib assert_build_output ./bazel-bin/${java_pkg}/hello-data ${java_pkg}:hello-data assert_build_output ./bazel-bin/${java_pkg}/hello-world ${java_pkg}:hello-world @@ -177,9 +177,9 @@ function test_java_skylark() { assert_binary_run_from_subdir "bazel-bin/${java_pkg}/hello-data foo" "Heyo foo" } -function test_java_test_skylark() { - setup_skylark_javatest_support - javatests=examples/java-skylark/src/test/java/com/example/myproject +function test_java_test_starlark() { + setup_starlark_javatest_support + javatests=examples/java-starlark/src/test/java/com/example/myproject assert_build //${javatests}:pass assert_test_ok //${javatests}:pass assert_test_fails //${javatests}:fail diff --git a/src/test/shell/bazel/bazel_execlog_test.sh b/src/test/shell/bazel/bazel_execlog_test.sh index c72bab90de2c94..11412e0687a463 100755 --- a/src/test/shell/bazel/bazel_execlog_test.sh +++ b/src/test/shell/bazel/bazel_execlog_test.sh @@ -22,7 +22,7 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \ function test_dir_depends() { create_new_workspace - cat > skylark.bzl <<'EOF' + cat > starlark.bzl <<'EOF' def _dir_impl(ctx): output_dir = ctx.actions.declare_directory(ctx.attr.outdir) ctx.actions.run_shell( @@ -45,7 +45,7 @@ gen_dir = rule( ) EOF cat > BUILD <<'EOF' -load(":skylark.bzl", "gen_dir") +load(":starlark.bzl", "gen_dir") gen_dir( name = "dir", @@ -145,7 +145,7 @@ EOF function test_no_output() { create_new_workspace - cat > skylark.bzl <<'EOF' + cat > starlark.bzl <<'EOF' def _impl(ctx): ctx.actions.write(ctx.outputs.executable, content="echo hello world", is_executable=True) return DefaultInfo() @@ -157,7 +157,7 @@ my_test = rule( EOF cat > BUILD <<'EOF' -load(":skylark.bzl", "my_test") +load(":starlark.bzl", "my_test") my_test( name = "little_test", diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh index a2fed48add98fa..8c4d2989a65572 100755 --- a/src/test/shell/bazel/bazel_java_test.sh +++ b/src/test/shell/bazel/bazel_java_test.sh @@ -1445,9 +1445,9 @@ function test_java_info_constructor_e2e() { cat > java/com/google/foo/BUILD << EOF load(":my_rule.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'], ) EOF @@ -1485,7 +1485,7 @@ my_rule = rule( ) EOF - bazel build java/com/google/foo:my_skylark_rule >& "$TEST_log" || fail "Expected success" + bazel build java/com/google/foo:my_starlark_rule >& "$TEST_log" || fail "Expected success" } # This test builds a simple java deploy jar using remote singlejar and ijar diff --git a/src/test/shell/bazel/bazel_repository_cache_test.sh b/src/test/shell/bazel/bazel_repository_cache_test.sh index 87056eacc8d3c0..11b9eedfdc606a 100755 --- a/src/test/shell/bazel/bazel_repository_cache_test.sh +++ b/src/test/shell/bazel/bazel_repository_cache_test.sh @@ -51,7 +51,7 @@ http_archive( EOF } -function setup_skylark_repository() { +function setup_starlark_repository() { # Prepare HTTP server with Python local server_dir="${TEST_TMPDIR}/server_dir" mkdir -p "${server_dir}" @@ -321,8 +321,8 @@ function test_failed_fetch_without_cache() { expect_log "Error downloading" } -function test_skylark_download_file_exists_in_cache() { - setup_skylark_repository +function test_starlark_download_file_exists_in_cache() { + setup_starlark_repository cat >test.bzl <test.bzl <test.bzl <test.bzl <test.bzl <test.bzl <> examples/genrule/skylark.bzl -def _skylark_breaks1_impl(ctx): + cat << 'EOF' >> examples/genrule/starlark.bzl +def _starlark_breaks1_impl(ctx): print(ctx.outputs.output.path) ctx.actions.run_shell( inputs = [ ctx.file.input ], @@ -186,8 +186,8 @@ def _skylark_breaks1_impl(ctx): execution_requirements = { tag: '' for tag in ctx.attr.action_tags }, ) -skylark_breaks1 = rule( - _skylark_breaks1_impl, +starlark_breaks1 = rule( + _starlark_breaks1_impl, attrs = { "input": attr.label(mandatory=True, allow_single_file=True), "output": attr.output(mandatory=True), @@ -267,10 +267,10 @@ function test_sandbox_undeclared_deps_with_local_tag() { || fail "Genrule did not produce output: examples/genrule:breaks1_works_with_local_tag" } -function test_sandbox_undeclared_deps_skylark() { - output_file="${BAZEL_BIN_DIR}/examples/genrule/skylark_breaks1.txt" - bazel build examples/genrule:skylark_breaks1 &> $TEST_log \ - && fail "Non-hermetic genrule succeeded: examples/genrule:skylark_breaks1" || true +function test_sandbox_undeclared_deps_starlark() { + output_file="${BAZEL_BIN_DIR}/examples/genrule/starlark_breaks1.txt" + bazel build examples/genrule:starlark_breaks1 &> $TEST_log \ + && fail "Non-hermetic genrule succeeded: examples/genrule:starlark_breaks1" || true [ -f "$output_file" ] || fail "Action did not produce output: $output_file" @@ -283,11 +283,11 @@ function test_sandbox_undeclared_deps_skylark() { fail "Output did not contain expected error message: $output_file" } -function test_sandbox_undeclared_deps_skylark_with_local_tag() { - bazel build examples/genrule:skylark_breaks1_works_with_local_tag &> $TEST_log \ - || fail "Non-hermetic genrule failed even though tags=['local']: examples/genrule:skylark_breaks1_works_with_local_tag" - [ -f "${BAZEL_BIN_DIR}/examples/genrule/skylark_breaks1_works_with_local_tag.txt" ] \ - || fail "Action did not produce output: examples/genrule:skylark_breaks1_works_with_local_tag" +function test_sandbox_undeclared_deps_starlark_with_local_tag() { + bazel build examples/genrule:starlark_breaks1_works_with_local_tag &> $TEST_log \ + || fail "Non-hermetic genrule failed even though tags=['local']: examples/genrule:starlark_breaks1_works_with_local_tag" + [ -f "${BAZEL_BIN_DIR}/examples/genrule/starlark_breaks1_works_with_local_tag.txt" ] \ + || fail "Action did not produce output: examples/genrule:starlark_breaks1_works_with_local_tag" } function test_sandbox_block_filesystem() { diff --git a/src/test/shell/bazel/external_starlark_load_test.sh b/src/test/shell/bazel/external_starlark_load_test.sh index 410268e34b9c35..42d6d848193124 100755 --- a/src/test/shell/bazel/external_starlark_load_test.sh +++ b/src/test/shell/bazel/external_starlark_load_test.sh @@ -40,7 +40,7 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \ # BUILD # macro_def.bzl # external_constants.bzl -function run_external_skylark_load_test() { +function run_external_starlark_load_test() { load_target_to_test=$1 expected_test_output=$2 @@ -88,31 +88,31 @@ EOF # A label with an explicit external repo reference should be resolved relative # to the external repo. -function test_load_skylark_from_external_repo_with_pkg_relative_label_load() { - run_external_skylark_load_test \ +function test_load_starlark_from_external_repo_with_pkg_relative_label_load() { + run_external_starlark_load_test \ "@external_repo//external_pkg:external_constants.bzl" "EXTERNAL!" } # A relative label should be resolved relative to the external package. -function test_load_skylark_from_external_repo_with_pkg_relative_label_load() { - run_external_skylark_load_test ":external_constants.bzl" "EXTERNAL!" +function test_load_starlark_from_external_repo_with_pkg_relative_label_load() { + run_external_starlark_load_test ":external_constants.bzl" "EXTERNAL!" } # An absolute label with no repo prefix should be resolved relative to the # current (external) repo. -function test_load_skylark_from_external_repo_with_pkg_relative_path_load() { - run_external_skylark_load_test "//external_pkg:external_constants.bzl" \ +function test_load_starlark_from_external_repo_with_pkg_relative_path_load() { + run_external_starlark_load_test "//external_pkg:external_constants.bzl" \ "EXTERNAL!" } # An absolute label with the special "@" prefix should cause be resolved # relative to the default repo. -function test_load_skylark_from_external_repo_with_repo_relative_label_load() { - run_external_skylark_load_test "@//another_local_pkg:local_constants.bzl" \ +function test_load_starlark_from_external_repo_with_repo_relative_label_load() { + run_external_starlark_load_test "@//another_local_pkg:local_constants.bzl" \ "LOCAL!" } -function test_skylark_repository_relative_label() { +function test_starlark_repository_relative_label() { repo2=$TEST_TMPDIR/repo2 mkdir -p $repo2 touch $repo2/WORKSPACE $repo2/BUILD @@ -163,7 +163,7 @@ EOF # If //foo in local depends on //bar in r1, which is a Starlark rule # defined in r2/remote.bzl, then a Label in remote.bzl should either # resolve to @r2//whatever or @r1//whatever. -function test_skylark_repository_nested_relative_label() { +function test_starlark_repository_nested_relative_label() { repo1=$TEST_TMPDIR/repo1 repo2=$TEST_TMPDIR/repo2 mkdir -p $repo1 $repo2 @@ -225,7 +225,7 @@ EOF expect_log "@r1//foo:bar" } -function test_aspects_and_skylark_repositories() { +function test_aspects_and_starlark_repositories() { cat > WORKSPACE < a/rule.bzl <<'EOF' def _gen_output_dir_impl(ctx): @@ -242,8 +242,8 @@ Shuffle, duffle, muzzle, muff EOF } -function test_directory_artifact_skylark_local() { - set_directory_artifact_skylark_testfixtures +function test_directory_artifact_starlark_local() { + set_directory_artifact_starlark_testfixtures bazel build //a:test >& $TEST_log \ || fail "Failed to build //a:test without remote execution" @@ -251,8 +251,8 @@ function test_directory_artifact_skylark_local() { || fail "Local execution generated different result" } -function test_directory_artifact_skylark() { - set_directory_artifact_skylark_testfixtures +function test_directory_artifact_starlark() { + set_directory_artifact_starlark_testfixtures bazel build \ --spawn_strategy=remote \ @@ -272,8 +272,8 @@ function test_directory_artifact_skylark() { || fail "Remote cache hit generated different result" } -function test_directory_artifact_skylark_grpc_cache() { - set_directory_artifact_skylark_testfixtures +function test_directory_artifact_starlark_grpc_cache() { + set_directory_artifact_starlark_testfixtures bazel build \ --remote_cache=grpc://localhost:${worker_port} \ @@ -291,8 +291,8 @@ function test_directory_artifact_skylark_grpc_cache() { || fail "Remote cache hit generated different result" } -function test_directory_artifact_skylark_http_cache() { - set_directory_artifact_skylark_testfixtures +function test_directory_artifact_starlark_http_cache() { + set_directory_artifact_starlark_testfixtures bazel build \ --remote_cache=http://localhost:${http_port} \ @@ -310,8 +310,8 @@ function test_directory_artifact_skylark_http_cache() { || fail "Remote cache hit generated different result" } -function test_directory_artifact_in_runfiles_skylark_http_cache() { - set_directory_artifact_skylark_testfixtures +function test_directory_artifact_in_runfiles_starlark_http_cache() { + set_directory_artifact_starlark_testfixtures bazel build \ --remote_cache=http://localhost:${http_port} \ diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh index 9a81ad804dbdcd..6d686326a0e5e0 100755 --- a/src/test/shell/bazel/remote/remote_execution_test.sh +++ b/src/test/shell/bazel/remote/remote_execution_test.sh @@ -854,13 +854,13 @@ function test_treeartifact_in_runfiles() { load(":output_directory.bzl", "gen_output_dir", "gen_output_dir_test") gen_output_dir( - name = "skylark_output_dir", + name = "starlark_output_dir", outdir = "dir", ) gen_output_dir_test( - name = "skylark_output_dir_test", - dir = ":skylark_output_dir", + name = "starlark_output_dir_test", + dir = ":starlark_output_dir", ) EOF cat > a/output_directory.bzl <<'EOF' @@ -908,14 +908,14 @@ EOF # a test into the sandboxing module. bazel test \ --spawn_strategy=sandboxed \ - //a:skylark_output_dir_test \ - || fail "Failed to run //a:skylark_output_dir_test with sandboxing" + //a:starlark_output_dir_test \ + || fail "Failed to run //a:starlark_output_dir_test with sandboxing" bazel test \ --spawn_strategy=remote \ --remote_executor=grpc://localhost:${worker_port} \ - //a:skylark_output_dir_test \ - || fail "Failed to run //a:skylark_output_dir_test with remote execution" + //a:starlark_output_dir_test \ + || fail "Failed to run //a:starlark_output_dir_test with remote execution" } function test_downloads_minimal() { diff --git a/src/test/shell/bazel/starlark_repository_test.sh b/src/test/shell/bazel/starlark_repository_test.sh index 0131972c862dcf..06da53d3246f44 100755 --- a/src/test/shell/bazel/starlark_repository_test.sh +++ b/src/test/shell/bazel/starlark_repository_test.sh @@ -322,7 +322,7 @@ EOF expect_log "Failed to load Starlark extension '@does_not_exist//:random.bzl'" } -function test_skylark_local_repository() { +function test_starlark_local_repository() { create_new_workspace repo2=$new_workspace_dir # Remove the WORKSPACE file in the symlinked repo, so our Starlark rule has to @@ -359,7 +359,7 @@ EOF expect_log "foo" } -function setup_skylark_repository() { +function setup_starlark_repository() { create_new_workspace repo2=$new_workspace_dir @@ -375,8 +375,8 @@ EOF cat > BUILD } -function test_skylark_flags_affect_repository_rule() { - setup_skylark_repository +function test_starlark_flags_affect_repository_rule() { + setup_starlark_repository cat >test.bzl < bin.sh echo "exit 0" >> bin.sh @@ -440,8 +440,8 @@ EOF expect_log "version" } -function test_skylark_repository_execute_stderr() { - setup_skylark_repository +function test_starlark_repository_execute_stderr() { + setup_starlark_repository cat >test.bzl <test.bzl <test.bzl <bar.tpl FOO=%{FOO} BAR=%{BAR} BAZ=%{BAZ} @@ -665,7 +665,7 @@ function environ_invalidation_test_template() { assert_equals 4 $(cat "${execution_file}") # Now try to depends on more variables - write_environ_skylark "${execution_file}" '"FOO", "BAR", "BAZ"' + write_environ_starlark "${execution_file}" '"FOO", "BAR", "BAZ"' # The Starlark rule has changed, so a rebuild should happen FOO=BAZ bazel ${startup_flag} build @foo//:bar >& $TEST_log \ @@ -688,7 +688,7 @@ function environ_invalidation_test_template() { function environ_invalidation_action_env_test_template() { local startup_flag="${1-}" - setup_skylark_repository + setup_starlark_repository # We use a counter to avoid other invalidation to hide repository # invalidation (e.g., --action_env will cause all action to re-run). @@ -716,20 +716,20 @@ function environ_invalidation_action_env_test_template() { assert_equals 2 $(cat "${execution_file}") } -function test_skylark_repository_environ_invalidation() { +function test_starlark_repository_environ_invalidation() { environ_invalidation_test_template } # Same test as previous but with server restart between each invocation -function test_skylark_repository_environ_invalidation_batch() { +function test_starlark_repository_environ_invalidation_batch() { environ_invalidation_test_template --batch } -function test_skylark_repository_environ_invalidation_action_env() { +function test_starlark_repository_environ_invalidation_action_env() { environ_invalidation_action_env_test_template } -function test_skylark_repository_environ_invalidation_action_env_batch() { +function test_starlark_repository_environ_invalidation_action_env_batch() { environ_invalidation_action_env_test_template --batch } @@ -770,12 +770,12 @@ EOF assert_equals 3 $(cat "${execution_file}") } -function test_skylark_repository_bzl_invalidation() { +function test_starlark_repository_bzl_invalidation() { bzl_invalidation_test_template } # Same test as previous but with server restart between each invocation -function test_skylark_repository_bzl_invalidation_batch() { +function test_starlark_repository_bzl_invalidation_batch() { bzl_invalidation_test_template --batch } @@ -804,12 +804,12 @@ EOF assert_equals 2 $(cat "${execution_file}") } -function test_skylark_repository_file_invalidation() { +function test_starlark_repository_file_invalidation() { file_invalidation_test_template } # Same test as previous but with server restart between each invocation -function test_skylark_repository_file_invalidation_batch() { +function test_starlark_repository_file_invalidation_batch() { file_invalidation_test_template --batch } @@ -853,7 +853,7 @@ function test_starlark_invalidation_batch() { function test_repo_env() { - setup_skylark_repository + setup_starlark_repository cat > test.bzl <<'EOF' def _impl(ctx): @@ -977,13 +977,13 @@ EOF diff time2.txt time3.txt || fail "Expected repo to not be refetched" } -function test_skylark_repository_executable_flag() { +function test_starlark_repository_executable_flag() { if "$is_windows"; then # There is no executable flag on Windows. - echo "Skipping test_skylark_repository_executable_flag on Windows" + echo "Skipping test_starlark_repository_executable_flag on Windows" return fi - setup_skylark_repository + setup_starlark_repository # Our custom repository rule cat >test.bzl <test.bzl <test.bzl <test.bzl <bar.tpl FOO=%{FOO} BAR=%{BAR} BAZ=%{BAZ} EOF - write_environ_skylark "${TEST_TMPDIR}/executionFOO" "" + write_environ_starlark "${TEST_TMPDIR}/executionFOO" "" mv test.bzl testfoo.bzl - write_environ_skylark "${TEST_TMPDIR}/executionBAR" "" + write_environ_starlark "${TEST_TMPDIR}/executionBAR" "" mv test.bzl testbar.bzl cat > WORKSPACE <<'EOF' load("//:testfoo.bzl", foorepo="repo") diff --git a/src/test/shell/bazel/starlark_rule_test.sh b/src/test/shell/bazel/starlark_rule_test.sh index d8eb84bc3aeb3e..62011a175b17e7 100755 --- a/src/test/shell/bazel/starlark_rule_test.sh +++ b/src/test/shell/bazel/starlark_rule_test.sh @@ -25,7 +25,7 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \ function test_basic_output() { mkdir -p test cat << EOF >> test/BUILD -load(":skylark.bzl", "test_rule") +load(":starlark.bzl", "test_rule") test_rule( name = "test", @@ -33,7 +33,7 @@ test_rule( ) EOF - cat << 'EOF' >> test/skylark.bzl + cat << 'EOF' >> test/starlark.bzl def _test_impl(ctx): ctx.actions.run_shell(outputs = [ctx.outputs.out], command = ["touch", ctx.outputs.out.path]) @@ -58,7 +58,7 @@ EOF function test_execution_failure() { mkdir -p test cat << EOF >> test/BUILD -load(":skylark.bzl", "test_rule") +load(":starlark.bzl", "test_rule") test_rule( name = "test", @@ -66,7 +66,7 @@ test_rule( ) EOF - cat << 'EOF' >> test/skylark.bzl + cat << 'EOF' >> test/starlark.bzl def _test_impl(ctx): ctx.actions.run_shell(outputs = [ctx.outputs.out], command = ["not_a_command", ctx.outputs.out.path]) diff --git a/src/test/shell/bazel/tags_propagation_starlark_test.sh b/src/test/shell/bazel/tags_propagation_starlark_test.sh index 0fa8af5cc81035..cee8cb9820a45b 100755 --- a/src/test/shell/bazel/tags_propagation_starlark_test.sh +++ b/src/test/shell/bazel/tags_propagation_starlark_test.sh @@ -27,7 +27,7 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \ function test_tags_propagated_to_run_shell() { mkdir -p test cat << EOF >> test/BUILD -load(":skylark.bzl", "test_rule") +load(":starlark.bzl", "test_rule") test_rule( name = "test", @@ -36,7 +36,7 @@ test_rule( ) EOF - cat << 'EOF' >> test/skylark.bzl + cat << 'EOF' >> test/starlark.bzl def _test_impl(ctx): ctx.actions.run_shell(outputs = [ctx.outputs.out], command = ["touch", ctx.outputs.out.path]) @@ -64,7 +64,7 @@ EOF function test_tags_propagated_to_run() { mkdir -p test cat << EOF >> test/BUILD -load(":skylark.bzl", "test_rule") +load(":starlark.bzl", "test_rule") test_rule( name = "test", @@ -73,7 +73,7 @@ test_rule( ) EOF - cat << 'EOF' >> test/skylark.bzl + cat << 'EOF' >> test/starlark.bzl def _test_impl(ctx): ctx.actions.run( outputs = [ctx.outputs.out], @@ -102,7 +102,7 @@ EOF function test_tags_propagated_to_run_with_exec_info_in_rule() { mkdir -p test cat << EOF >> test/BUILD -load(":skylark.bzl", "test_rule") +load(":starlark.bzl", "test_rule") test_rule( name = "test", @@ -111,7 +111,7 @@ test_rule( ) EOF - cat << 'EOF' >> test/skylark.bzl + cat << 'EOF' >> test/starlark.bzl def _test_impl(ctx): ctx.actions.run( outputs = [ctx.outputs.out], @@ -141,7 +141,7 @@ EOF function test_tags_not_propagated_to_run_when_incompatible_flag_off() { mkdir -p test cat << EOF >> test/BUILD -load(":skylark.bzl", "test_rule") +load(":starlark.bzl", "test_rule") test_rule( name = "test", @@ -150,7 +150,7 @@ test_rule( ) EOF - cat << 'EOF' >> test/skylark.bzl + cat << 'EOF' >> test/starlark.bzl def _test_impl(ctx): ctx.actions.run( outputs = [ctx.outputs.out], diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh index 3b2a82b95c4b91..c8bc5135bd323c 100755 --- a/src/test/shell/bazel/workspace_test.sh +++ b/src/test/shell/bazel/workspace_test.sh @@ -171,7 +171,7 @@ EOF [ ! -L bazel-x ] || fail "bazel-x should have been removed" } -function test_skylark_flags_affect_workspace() { +function test_starlark_flags_affect_workspace() { cat >> $(create_workspace_with_default_repos WORKSPACE) < "$pkg/rule.bzl" <<'EOF' diff --git a/src/test/shell/integration/bazel_query_test.sh b/src/test/shell/integration/bazel_query_test.sh index 8c5d6b727bf394..9e39953c972990 100755 --- a/src/test/shell/integration/bazel_query_test.sh +++ b/src/test/shell/integration/bazel_query_test.sh @@ -272,7 +272,7 @@ function test_minrank_le_depth_bound() { done } -function test_skylark_dep_in_sky_query() { +function test_starlark_dep_in_sky_query() { rm -rf foo rm -rf bar mkdir -p foo bar || fail "Couldn't make directories" @@ -286,7 +286,7 @@ function test_skylark_dep_in_sky_query() { expect_not_log "fakerule\.bzl" } -function test_skylark_regular_file_not_included_in_rbuildfiles() { +function test_starlark_regular_file_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo || fail "Couldn't make directories" echo "baz" > "foo/baz.bzl" || fail "Couldn't create baz.bzl" @@ -299,7 +299,7 @@ function test_skylark_regular_file_not_included_in_rbuildfiles() { rm -rf foo } -function test_skylark_symlink_source_not_included_in_rbuildfiles() { +function test_starlark_symlink_source_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo || fail "Couldn't make directories" echo "moo" > "foo/moo" || fail "Couldn't create moo" @@ -313,7 +313,7 @@ function test_skylark_symlink_source_not_included_in_rbuildfiles() { rm -rf foo } -function test_skylark_symlink_target_not_included_in_rbuildfiles() { +function test_starlark_symlink_target_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo || fail "Couldn't make directories" echo "baz" > "foo/baz.bzl" || fail "Couldn't create baz.bzl" @@ -327,7 +327,7 @@ function test_skylark_symlink_target_not_included_in_rbuildfiles() { rm -rf foo } -function test_skylark_glob_regular_file_not_included_in_rbuildfiles() { +function test_starlark_glob_regular_file_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo || fail "Couldn't make directories" echo "baz" > "foo/baz.bzl" || fail "Couldn't create baz.bzl" @@ -340,7 +340,7 @@ function test_skylark_glob_regular_file_not_included_in_rbuildfiles() { rm -rf foo } -function test_skylark_glob_symlink_source_not_included_in_rbuildfiles() { +function test_starlark_glob_symlink_source_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo || fail "Couldn't make directories" echo "moo" > "foo/moo" || fail "Couldn't create moo" @@ -354,7 +354,7 @@ function test_skylark_glob_symlink_source_not_included_in_rbuildfiles() { rm -rf foo } -function test_skylark_glob_symlink_target_not_included_in_rbuildfiles() { +function test_starlark_glob_symlink_target_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo || fail "Couldn't make directories" echo "baz" > "foo/baz.bzl" || fail "Couldn't create baz.bzl" @@ -368,7 +368,7 @@ function test_skylark_glob_symlink_target_not_included_in_rbuildfiles() { rm -rf foo } -function test_skylark_recursive_glob_regular_file_not_included_in_rbuildfiles() { +function test_starlark_recursive_glob_regular_file_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo/bar || fail "Couldn't make directories" echo "baz" > "foo/bar/baz.bzl" || fail "Couldn't create baz.bzl" @@ -381,7 +381,7 @@ function test_skylark_recursive_glob_regular_file_not_included_in_rbuildfiles() rm -rf foo } -function test_skylark_recursive_glob_symlink_source_not_included_in_rbuildfiles() { +function test_starlark_recursive_glob_symlink_source_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo/bar || fail "Couldn't make directories" echo "moo" > "foo/moo" || fail "Couldn't create moo" @@ -395,7 +395,7 @@ function test_skylark_recursive_glob_symlink_source_not_included_in_rbuildfiles( rm -rf foo } -function test_skylark_recursive_glob_symlink_target_not_included_in_rbuildfiles() { +function test_starlark_recursive_glob_symlink_target_not_included_in_rbuildfiles() { rm -rf foo mkdir -p foo/bar || fail "Couldn't make directories" echo "baz" > "foo/bar/baz.bzl" || fail "Couldn't create baz.bzl" @@ -409,7 +409,7 @@ function test_skylark_recursive_glob_symlink_target_not_included_in_rbuildfiles( rm -rf foo } -function test_skylark_subdir_dep_in_sky_query() { +function test_starlark_subdir_dep_in_sky_query() { rm -rf foo mkdir -p foo bar/baz || fail "Couldn't make directories" echo 'load("//bar:baz/fakerule.bzl", "const")' > foo/BUILD || fail "Couldn't write" diff --git a/src/test/shell/integration/modify_execution_info_test.sh b/src/test/shell/integration/modify_execution_info_test.sh index 61b0ab5b883f18..0a061d3de1086a 100755 --- a/src/test/shell/integration/modify_execution_info_test.sh +++ b/src/test/shell/integration/modify_execution_info_test.sh @@ -187,9 +187,9 @@ EOF fi local pkg="${FUNCNAME[0]}" mkdir -p "$pkg" || fail "mkdir -p $pkg" - echo "load('//$pkg:shell.bzl', 'skylark_shell')" > "$pkg/BUILD" + echo "load('//$pkg:shell.bzl', 'starlark_shell')" > "$pkg/BUILD" cat >> "$pkg/BUILD" <<'EOF' -skylark_shell( +starlark_shell( name = "shelly", output = "ok.txt", ) @@ -220,7 +220,7 @@ def _impl(ctx): command = "touch %s" % ctx.outputs.output.path, ) -skylark_shell = rule( +starlark_shell = rule( _impl, attrs = { "output": attr.output(mandatory=True), diff --git a/src/test/shell/integration/outputs_test.sh b/src/test/shell/integration/outputs_test.sh index e2f523a0b28e64..864e1b204b64dc 100755 --- a/src/test/shell/integration/outputs_test.sh +++ b/src/test/shell/integration/outputs_test.sh @@ -210,4 +210,4 @@ EOF expect_log "Attribute foo is configurable and cannot be used in outputs" } -run_suite "skylark outputs tests" +run_suite "starlark outputs tests" diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index a48de5e852324a..3e9d909e11f915 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -439,7 +439,7 @@ toolchain( EOF } -function setup_skylark_javatest_support() { +function setup_starlark_javatest_support() { setup_javatest_common grep -q "name = \"junit4-jars\"" third_party/BUILD \ || cat <>third_party/BUILD