diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index 986e31c2c2..674a88107e 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -253,7 +253,7 @@ public class BazelRuleClassProvider { .addBuildInfoFactory(new ObjcBuildInfoFactory()) .setConfigurationCollectionFactory(new BazelConfigurationCollection()) .setPrelude("//tools/build_rules:prelude_bazel") - .setRunfilesPrefix("") + .setRunfilesPrefix("__main__") .setToolsRepository(TOOLS_REPOSITORY) .setPrerequisiteValidator(new BazelPrerequisiteValidator()) .setSkylarkAccessibleTopLevels(skylarkBuiltinJavaObects); diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java index a14172f55c..cab180b1a5 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java @@ -43,7 +43,7 @@ public class TestConstants { /** * Default workspace name. */ - public static final String WORKSPACE_NAME = ""; + public static final String WORKSPACE_NAME = "__main__"; /** * Name of a class with an INSTANCE field of type AnalysisMock to be used for analysis tests. diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh index b0f7e4e312..73893ace8f 100755 --- a/src/test/shell/bazel/bazel_rules_test.sh +++ b/src/test/shell/bazel/bazel_rules_test.sh @@ -63,7 +63,7 @@ function test_extra_action() { # a program that parses the proto here. cat > mypkg/echoer.sh <<EOF #!/bin/bash -if [[ ! -e \$0.runfiles/mypkg/runfile ]]; then +if [[ ! -e \$0.runfiles/__main__/mypkg/runfile ]]; then echo "Runfile not found" >&2 exit 1 fi diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh index 27097bc9c1..9e6bc857d8 100755 --- a/src/test/shell/bazel/bazel_sandboxing_test.sh +++ b/src/test/shell/bazel/bazel_sandboxing_test.sh @@ -164,7 +164,7 @@ EOF #!/bin/sh set -e -cp $(dirname $0)/tool.runfiles/examples/genrule/datafile $1 +cp $(dirname $0)/tool.runfiles/__main__/examples/genrule/datafile $1 echo "Tools work!" EOF chmod +x examples/genrule/tool.sh |