diff options
| author |  John Cater <jcater@google.com> | 2017-04-20 16:10:11 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-24 16:46:21 +0200 |
| commit | e684392afc06a07c4fe6885c9eca7795c35e44c4 (patch) | |
| tree | 90052ffec07ba41cdf04ef3ccfb10c336cbad1dd /src/test/java/com/google/devtools/build/lib/skylark | |
| parent | bc133cb5b95d0897b8e4fcc5ac63b8ad7dd96671 (diff) | |
Fix tests to create WORKSPACE files for local repositories.
Part of #2841.
Change-Id: I4d1e63aac6b5ed6beb9854b9b67d2899d8da4418
PiperOrigin-RevId: 153705466
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skylark')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java | 1 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java index 76c80b6cf9..a52ee89a5a 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java @@ -184,6 +184,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase { scratch.readFile("WORKSPACE"), "local_repository(name='local', path='local/repo')" ); + scratch.file("local/repo/WORKSPACE"); scratch.file( "local/repo/aspect.bzl", "def _impl(target, ctx):", diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index c07dfa91ab..e872f8f280 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -340,6 +340,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { /* The error message for this case used to be wrong. */ @Test public void testPackageBoundaryError_ExternalRepository() throws Exception { + scratch.file("/r/WORKSPACE"); scratch.file("/r/BUILD", "cc_library(name = 'cclib',", " srcs = ['sub/my_sub_lib.h'])"); scratch.file("/r/sub/BUILD", "cc_library(name = 'my_sub_lib', srcs = ['my_sub_lib.h'])"); scratch.overwriteFile("WORKSPACE", @@ -1181,6 +1182,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { scratch.file("BUILD", "filegroup(name='dep')"); + scratch.file("/r/WORKSPACE"); scratch.file("/r/a/BUILD", "load('/external_rule', 'external_rule')", "external_rule(name='r')"); @@ -1212,6 +1214,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { " }", ")"); + scratch.file("/r/WORKSPACE"); scratch.file("/r/BUILD", "filegroup(name='dep')"); @@ -1246,6 +1249,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { "def macro(name, path):", " native.local_repository(name = name, path = path)" ); + scratch.file("/r2/WORKSPACE"); scratch.file( "/r2/other_test.bzl", "def other_macro(name, path):", |