diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp')
3 files changed, 23 insertions, 17 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index b70d273067..ac3c2c863a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -44,6 +44,7 @@ import com.google.devtools.build.lib.util.OsUtils; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig; import com.google.devtools.common.options.InvocationPolicyEnforcer; import java.util.Arrays; @@ -551,7 +552,7 @@ public class CcCommonTest extends BuildViewTestCase { .invalidateFilesUnderPathForTesting( reporter, new ModifiedFileSet.Builder().modify(PathFragment.create("WORKSPACE")).build(), - rootDirectory); + Root.fromPath(rootDirectory)); FileSystemUtils.createDirectoryAndParents(scratch.resolve("/foo/bar")); scratch.file("/foo/WORKSPACE", "workspace(name = 'pkg')"); scratch.file( diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 703c3ffb73..3819117c7c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -524,7 +524,9 @@ public class CppLinkActionTest extends BuildViewTestCase { public Artifact getOutputArtifact(String relpath) { return new Artifact( - getTargetConfiguration().getBinDirectory(RepositoryName.MAIN).getPath() + getTargetConfiguration() + .getBinDirectory(RepositoryName.MAIN) + .getRoot() .getRelative(relpath), getTargetConfiguration().getBinDirectory(RepositoryName.MAIN), getTargetConfiguration().getBinFragment().getRelative(relpath)); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java index 273d986133..6c4a74f289 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java @@ -39,52 +39,55 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase { @Test public void testDifferentOrderSameActionKey() throws Exception { - ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")); + Path includePath = rootDirectory.getRelative("out"); + ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, includePath); Artifact a = new Artifact(PathFragment.create("a"), root); Artifact b = new Artifact(PathFragment.create("b"), root); Artifact c = new Artifact(PathFragment.create("c"), root); Artifact d = new Artifact(PathFragment.create("d"), root); - CreateIncSymlinkAction action1 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, - ImmutableMap.of(a, b, c, d), root.getPath()); + CreateIncSymlinkAction action1 = + new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(a, b, c, d), includePath); // Can't reuse the artifacts here; that would lead to DuplicateArtifactException. a = new Artifact(PathFragment.create("a"), root); b = new Artifact(PathFragment.create("b"), root); c = new Artifact(PathFragment.create("c"), root); d = new Artifact(PathFragment.create("d"), root); - CreateIncSymlinkAction action2 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, - ImmutableMap.of(c, d, a, b), root.getPath()); + CreateIncSymlinkAction action2 = + new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(c, d, a, b), includePath); assertThat(action2.computeKey(actionKeyContext)) .isEqualTo(action1.computeKey(actionKeyContext)); } @Test public void testDifferentTargetsDifferentActionKey() throws Exception { - ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")); + Path includePath = rootDirectory.getRelative("out"); + ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, includePath); Artifact a = new Artifact(PathFragment.create("a"), root); Artifact b = new Artifact(PathFragment.create("b"), root); - CreateIncSymlinkAction action1 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, - ImmutableMap.of(a, b), root.getPath()); + CreateIncSymlinkAction action1 = + new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(a, b), includePath); // Can't reuse the artifacts here; that would lead to DuplicateArtifactException. a = new Artifact(PathFragment.create("a"), root); b = new Artifact(PathFragment.create("c"), root); - CreateIncSymlinkAction action2 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, - ImmutableMap.of(a, b), root.getPath()); + CreateIncSymlinkAction action2 = + new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(a, b), includePath); assertThat(action2.computeKey(actionKeyContext)) .isNotEqualTo(action1.computeKey(actionKeyContext)); } @Test public void testDifferentSymlinksDifferentActionKey() throws Exception { - ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")); + Path includePath = rootDirectory.getRelative("out"); + ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, includePath); Artifact a = new Artifact(PathFragment.create("a"), root); Artifact b = new Artifact(PathFragment.create("b"), root); - CreateIncSymlinkAction action1 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, - ImmutableMap.of(a, b), root.getPath()); + CreateIncSymlinkAction action1 = + new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(a, b), includePath); // Can't reuse the artifacts here; that would lead to DuplicateArtifactException. a = new Artifact(PathFragment.create("c"), root); b = new Artifact(PathFragment.create("b"), root); - CreateIncSymlinkAction action2 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, - ImmutableMap.of(a, b), root.getPath()); + CreateIncSymlinkAction action2 = + new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(a, b), includePath); assertThat(action2.computeKey(actionKeyContext)) .isNotEqualTo(action1.computeKey(actionKeyContext)); } |