The great Skylark -> Starlark symbol migration:
Rename some integration tests.
PiperOrigin-RevId: 315495893
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 2a7cf5c..1324ddd 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -545,7 +545,7 @@
/** Used in an integration test to confirm that flags are visible to the interpreter. */
@Option(
- name = "internal_skylark_flag_test_canary",
+ name = "internal_starlark_flag_test_canary",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.UNKNOWN})
diff --git a/src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java
index 6ae93d9..212a2f6 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java
@@ -161,7 +161,7 @@
"--incompatible_require_linker_input_cc_api=" + rand.nextBoolean(),
"--incompatible_restrict_string_escapes=" + rand.nextBoolean(),
"--incompatible_use_cc_configure_from_rules_cc=" + rand.nextBoolean(),
- "--internal_skylark_flag_test_canary=" + rand.nextBoolean(),
+ "--internal_starlark_flag_test_canary=" + rand.nextBoolean(),
"--max_computation_steps=" + rand.nextLong(),
"--record_rule_instantiation_callstack=" + rand.nextBoolean());
}
diff --git a/src/test/shell/bazel/starlark_repository_test.sh b/src/test/shell/bazel/starlark_repository_test.sh
index 9eb5174..9a9da44 100755
--- a/src/test/shell/bazel/starlark_repository_test.sh
+++ b/src/test/shell/bazel/starlark_repository_test.sh
@@ -394,11 +394,11 @@
expect_log "In repo rule: " "Did not find repository rule print output"
expect_not_log "$MARKER" \
"Marker string '$MARKER' was seen even though \
- --internal_skylark_flag_test_canary wasn't passed"
+ --internal_starlark_flag_test_canary wasn't passed"
# Build with the special testing flag that appends a marker string to all
# print() calls.
- bazel build @foo//:bar --internal_skylark_flag_test_canary >& $TEST_log \
+ bazel build @foo//:bar --internal_starlark_flag_test_canary >& $TEST_log \
|| fail "Expected build to succeed"
expect_log "In repo rule: $MARKER" \
"Starlark flags are not propagating to repository rule implementation \
diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index 7a5c4ef..3b2a82b 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -194,11 +194,11 @@
expect_log "In workspace macro: " "Did not find workspace macro print output"
expect_not_log "$MARKER" \
"Marker string '$MARKER' was seen even though \
- --internal_skylark_flag_test_canary wasn't passed"
+ --internal_starlark_flag_test_canary wasn't passed"
# Build with the special testing flag that appends a marker string to all
# print() calls.
- bazel build //:x --internal_skylark_flag_test_canary &>"$TEST_log" \
+ bazel build //:x --internal_starlark_flag_test_canary &>"$TEST_log" \
|| fail "Expected build to succeed"
expect_log "In workspace: $MARKER" \
"Starlark flags are not propagating to workspace evaluation"
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index b7d72bc..382f31a 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -358,9 +358,9 @@
)
sh_test(
- name = "skylark_flag_test",
+ name = "starlark_flag_test",
size = "medium",
- srcs = ["skylark_flag_test.sh"],
+ srcs = ["starlark_flag_test.sh"],
data = [
":test-deps",
"@bazel_tools//tools/bash/runfiles",
diff --git a/src/test/shell/integration/skylark_dependency_pruning_test.sh b/src/test/shell/integration/starlark_dependency_pruning_test.sh
similarity index 100%
rename from src/test/shell/integration/skylark_dependency_pruning_test.sh
rename to src/test/shell/integration/starlark_dependency_pruning_test.sh
diff --git a/src/test/shell/integration/skylark_flag_test.sh b/src/test/shell/integration/starlark_flag_test.sh
similarity index 94%
rename from src/test/shell/integration/skylark_flag_test.sh
rename to src/test/shell/integration/starlark_flag_test.sh
index 2fd5b15..2ca12f1 100755
--- a/src/test/shell/integration/skylark_flag_test.sh
+++ b/src/test/shell/integration/starlark_flag_test.sh
@@ -17,7 +17,7 @@
# Tests that the Starlark interpreter is reading flags passed in on the command
# line, in several different evaluation contexts.
#
-# The --internal_skylark_flag_test_canary flag is built into
+# The --internal_starlark_flag_test_canary flag is built into
# StarlarkSemanticsOptions specifically for this test suite.
# --- begin runfiles.bash initialization ---
@@ -72,7 +72,7 @@
MARKER="<== Starlark flag test ==>"
sanity_fail_msg="Marker string '$MARKER' was seen even though "
-sanity_fail_msg+="--internal_skylark_flag_test_canary wasn't passed"
+sanity_fail_msg+="--internal_starlark_flag_test_canary wasn't passed"
function test_build_file() {
@@ -95,7 +95,7 @@
expect_not_log "$MARKER" "$sanity_fail_msg"
bazel build //$pkg:dummy \
- --internal_skylark_flag_test_canary \
+ --internal_starlark_flag_test_canary \
&>"$TEST_log" || fail "bazel build failed";
expect_log "In BUILD: $MARKER" \
"Starlark flags are not propagating to BUILD file evaluation"
@@ -129,7 +129,7 @@
expect_not_log "$MARKER" "$sanity_fail_msg"
bazel build //$pkg:dummy \
- --internal_skylark_flag_test_canary \
+ --internal_starlark_flag_test_canary \
&>"$TEST_log" || fail "bazel build failed";
expect_log "In bzl: $MARKER" \
"Starlark flags are not propagating to .bzl file evaluation"
@@ -163,7 +163,7 @@
expect_not_log "$MARKER" "$sanity_fail_msg"
bazel build //$pkg:dummy \
- --internal_skylark_flag_test_canary \
+ --internal_starlark_flag_test_canary \
&>"$TEST_log" || fail "bazel build failed";
expect_log "In rule: $MARKER" \
"Starlark flags are not propagating to rule implementation function evaluation"
@@ -208,7 +208,7 @@
expect_not_log "$MARKER" "$sanity_fail_msg"
bazel build //$pkg:dummy --aspects $pkg/test.bzl%some_aspect \
- --internal_skylark_flag_test_canary \
+ --internal_starlark_flag_test_canary \
&>"$TEST_log" || fail "bazel build failed";
expect_log "In aspect: $MARKER" \
"Starlark flags are not propagating to aspect implementation function evaluation"
@@ -219,14 +219,14 @@
function test_nested_set_depth() {
mkdir -p test
cat << EOF >> test/BUILD
-load(":skylark.bzl", "test_rule")
+load(":starlark.bzl", "test_rule")
test_rule(
name = "test",
)
EOF
- cat << 'EOF' >> test/skylark.bzl
+ cat << 'EOF' >> test/starlark.bzl
def _test_impl(ctx):
x = depset([0])
for i in range(1, 1000):
@@ -258,4 +258,4 @@
}
-run_suite "skylark_flag_test"
+run_suite "starlark_flag_test"
