diff options
| author |  carmi <carmi@google.com> | 2017-10-18 21:10:50 -0400 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-10-20 14:04:05 +0200 |
| commit | bdd930a57d50827d7473c442774bb02881b4be27 (patch) | |
| tree | 2f4180f0d6c0657c45209218f08b587f3bc3b12c /src/test/java/com/google | |
| parent | 8ee423d9a8a85d39cfd23e43218b9fb2e5ca8f5f (diff) | |
[Bazel] Change default place where {java,cc}_proto_library look for their external repo dependencies.
This fixes https://github.com/cgrushko/proto_library/issues/4.
RELNOTES: [Bazel] {java,cc}_proto_library now look for dependencies in @com_google_protobuf, instead of in @com_google_protobuf_$LANG
PiperOrigin-RevId: 172685722
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 1 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index ffc94aae79..423f20c290 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -58,7 +58,6 @@ public final class BazelAnalysisMock extends AnalysisMock { "local_repository(name = 'bazel_tools', path = '" + bazelToolWorkspace + "')", "local_repository(name = 'local_config_xcode', path = '/local_config_xcode')", "local_repository(name = 'com_google_protobuf', path = '/protobuf')", - "local_repository(name = 'com_google_protobuf_java', path = '/protobuf')", "bind(name = 'android/sdk', actual='@bazel_tools//tools/android:sdk')", "bind(name = 'tools/python', actual='//tools/python')")); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java index f3656af3c6..0bbef79a00 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java @@ -34,9 +34,9 @@ import org.junit.runners.JUnit4; public class CcProtoLibraryTest extends BuildViewTestCase { @Before public void setUp() throws Exception { - scratch.file("protobuf/WORKSPACE"); - scratch.file( - "protobuf/BUILD", + mockToolsConfig.create("/protobuf/WORKSPACE"); + mockToolsConfig.overwrite( + "/protobuf/BUILD", "package(default_visibility=['//visibility:public'])", "exports_files(['protoc'])", "proto_lang_toolchain(", @@ -49,8 +49,7 @@ public class CcProtoLibraryTest extends BuildViewTestCase { new String(FileSystemUtils.readContentAsLatin1(rootDirectory.getRelative("WORKSPACE"))); mockToolsConfig.overwrite( "WORKSPACE", - "local_repository(name = 'com_google_protobuf', path = 'protobuf/')", - "local_repository(name = 'com_google_protobuf_cc', path = 'protobuf/')", + "local_repository(name = 'com_google_protobuf', path = '/protobuf/')", existingWorkspace); invalidatePackages(); // A dash of magic to re-evaluate the WORKSPACE file. } |