diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2015-09-24 08:09:09 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-09-24 14:21:48 +0000 |
| commit | 574646c670ddee337258718303dedde30e546fbe (patch) | |
| tree | 5862304004c03a3600959b1783cde47a78660eb2 | |
| parent | 960dc27e8cfecec2448b92810dfa14d3ce4f2f1e (diff) | |
Move mock workspace configuration to AnalysisMock.
--
MOS_MIGRATED_REVID=103823555
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 11 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java | 10 |
2 files changed, 11 insertions, 10 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 132a11d066..b7b778a232 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 @@ -45,7 +45,16 @@ public class BazelAnalysisMock extends AnalysisMock { @Override public void setupMockClient(MockToolsConfig config) throws IOException { - config.create("WORKSPACE"); + config.overwrite("WORKSPACE", + "bind(", + " name = 'objc_proto_lib',", + " actual = '//objcproto:ProtocolBuffers_lib',", + ")", + "bind(", + " name = 'objc_proto_cpp_lib',", + " actual = '//objcproto:ProtocolBuffersCPP_lib',", + ")"); + config.create("tools/defaults/BUILD"); config.create("tools/jdk/BUILD", "package(default_visibility=['//visibility:public'])", diff --git a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java index 62298ef06e..b7a527c1c8 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java @@ -70,15 +70,7 @@ public abstract class FoundationTestCase extends TestCase { scratch = new Scratch(createFileSystem(), "/workspace"); outputBase = scratch.dir("/usr/local/google/_blaze_jrluser/FAKEMD5/"); rootDirectory = scratch.dir("/workspace"); - scratch.file(rootDirectory.getRelative("WORKSPACE").getPathString(), - "bind(", - " name = 'objc_proto_lib',", - " actual = '//objcproto:ProtocolBuffers_lib',", - ")", - "bind(", - " name = 'objc_proto_cpp_lib',", - " actual = '//objcproto:ProtocolBuffersCPP_lib',", - ")"); + scratch.file(rootDirectory.getRelative("WORKSPACE").getPathString()); actionOutputBase = scratch.dir("/usr/local/google/_blaze_jrluser/FAKEMD5/action_out/"); eventCollector = new EventCollector(EventKind.ERRORS_AND_WARNINGS); reporter = new Reporter(eventCollector); |