diff options
| author |  tomlu <tomlu@google.com> | 2018-01-18 11:34:52 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-18 11:36:53 -0800 |
| commit | 908f6d5e54c7a7ab20220c298bd43b5a392fe912 (patch) | |
| tree | 265d4a4dfad9536e790110995885435cbbf9a7d3 /src/test/java/com/google/devtools/build/lib | |
| parent | 710b9a3af0c1432ed288fe02c8205b645a3e4d52 (diff) | |
Clean up ArtifactRoot.
* Use an enum instead of booleans and null fields having special meaning.
* Remove the exec root from ArtifactRoot. This is only used to calculate artifact exec paths, which can be done from the root's exec path and the root relative path.
PiperOrigin-RevId: 182411710
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java index c5abc9e663..bd8f78eb47 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java @@ -267,7 +267,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { ArtifactRoot.middlemanRoot(middlemanPath, middlemanPath.getRelative("out")); Path fullPath = middlemanRoot.getRoot().getRelative(path); return new Artifact( - fullPath, middlemanRoot, fullPath.relativeTo(middlemanRoot.getExecRoot()), ALL_OWNER); + fullPath, middlemanRoot, middlemanRoot.getExecPath().getRelative(path), ALL_OWNER); } private Artifact createDerivedTreeArtifactWithAction(String path) { |