diff options
| author |  tomlu <tomlu@google.com> | 2018-01-15 17:40:35 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-15 17:42:23 -0800 |
| commit | 89eaee567429b559ca9983fff146ae60477688ad (patch) | |
| tree | 9364b8881e424d61c585a950b299b60b3b7c19ec /src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java | |
| parent | 15b532652e446472d6a61af1ba73c8aca170500d (diff) | |
Remove use of Root#asDerivedRoot where the derived root == exec root.
This method violates the invariant that derived roots are never equal to the exec root. Only source roots can be equal to the exec root.
Note that this method was only used in tests, so this CL should be completely safe as long as its tests pass.
PiperOrigin-RevId: 181998483
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java index 3e413f5c6b..043476ed4a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java @@ -20,6 +20,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.testutil.Scratch; +import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import org.junit.Before; import org.junit.Test; @@ -36,7 +37,8 @@ public class J2ObjcSourceTest { @Before public final void setRootDir() throws Exception { Scratch scratch = new Scratch(); - rootDir = Root.asDerivedRoot(scratch.dir("/exec/root")); + Path execRoot = scratch.getFileSystem().getPath("/exec"); + rootDir = Root.asDerivedRoot(execRoot, scratch.dir("/exec/root")); } @Test |