Replace Skylark with Starlark in user-visible text. RELNOTES: None. PiperOrigin-RevId: 255971226
diff --git a/src/test/shell/bazel/bazel_execlog_test.sh b/src/test/shell/bazel/bazel_execlog_test.sh index b296253..8f07504 100755 --- a/src/test/shell/bazel/bazel_execlog_test.sh +++ b/src/test/shell/bazel/bazel_execlog_test.sh
@@ -86,8 +86,8 @@ # If dependencies were not properly accounted for, the order would have been: # rule1, rule2, dir1, dir2 - dir1Num=`grep "SkylarkAction dir_name1" -n output.json | grep -Eo '^[^:]+'` - dir2Num=`grep "SkylarkAction dir_name2" -n output.json | grep -Eo '^[^:]+'` + dir1Num=`grep "Action dir_name1" -n output.json | grep -Eo '^[^:]+'` + dir2Num=`grep "Action dir_name2" -n output.json | grep -Eo '^[^:]+'` rule1Num=`grep "Executing genrule //:rule1" -n output.json | grep -Eo '^[^:]+'` rule2Num=`grep "Executing genrule //:rule2" -n output.json | grep -Eo '^[^:]+'`
diff --git a/src/test/shell/integration/aquery_test.sh b/src/test/shell/integration/aquery_test.sh index 24afc26..aac6b59 100755 --- a/src/test/shell/integration/aquery_test.sh +++ b/src/test/shell/integration/aquery_test.sh
@@ -223,7 +223,7 @@ bazel aquery --output=text "//$pkg:goo" > output 2> "$TEST_log" \ || fail "Expected success" cat output >> "$TEST_log" - assert_contains "Mnemonic: SkylarkAction" output + assert_contains "Mnemonic: Action" output assert_contains "Target: //$pkg:goo" output assert_contains "Environment: \[.*foo=bar" output } @@ -729,7 +729,7 @@ outputs = [ctx.outputs.outfile], executable = 'dummy', arguments = ['--non-param-file-flag', args], - mnemonic = 'SkylarkAction' + mnemonic = 'Action' ) test_rule = rule(
diff --git a/src/test/shell/integration/modify_execution_info_test.sh b/src/test/shell/integration/modify_execution_info_test.sh index 52d0778..ed29252 100755 --- a/src/test/shell/integration/modify_execution_info_test.sh +++ b/src/test/shell/integration/modify_execution_info_test.sh
@@ -224,7 +224,7 @@ JavaSourceJar=+requires-java-source-jar,\ Javac=+requires-javac,\ PyTinypar=+requires-py-tinypar,\ -SkylarkAction=+requires-skylark-action \ +Action=+requires-action \ > output 2> "$TEST_log" || fail "Expected success" # There are sometimes other elements in ExecutionInfo, e.g. requires-darwin @@ -232,7 +232,7 @@ # would be brittle, irrelevant to the operation of the flag, and in some # cases platform-dependent, we just search for the key itself, not the whole # ExecutionInfo: {...} line. - assert_contains "requires-skylark-action: ''" output + assert_contains "requires-action: ''" output assert_contains "requires-cpp-compile: ''" output assert_contains "requires-cpp-link: ''" output assert_contains "requires-extra-action: ''" output