diff options
| author |  hlopko <hlopko@google.com> | 2017-04-04 13:53:14 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-04-04 18:38:24 +0200 |
| commit | c4134802dd15d6ef5cca6521f6bf6aac395ee2ad (patch) | |
| tree | bcb3f28c5a4357f0089c2c71b738d63a748ef788 /src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java | |
| parent | 64f80799ed5c6369ffb6814f939a7964b0fa7c49 (diff) | |
Automated g4 rollback of commit 1d9e1ac90197b1d3d7b137ba3c1ada67bb9ba31b.
*** Reason for rollback ***
Breaks //src/test/shell/integration:force_delete_output_test
*** Original change description ***
Symlink output directories to the correct directory name
If the workspace directory is /path/to/my/proj and the name in the WORKSPACE
file is "floop", this will symlink the output directories to
output_base/execroot/floop instead of output_base/execroot/proj.
More prep for #1262, fixes #1681.
PiperOrigin-RevId: 152126545
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java index 5f58462fc6..0410e5ce50 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.exec.util.TestExecutorBuilder; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import org.junit.Before; @@ -48,8 +47,7 @@ public class SymlinkActionTest extends BuildViewTestCase { public final void setUp() throws Exception { input = scratch.file("input.txt", "Hello, world."); inputArtifact = getSourceArtifact("input.txt"); - Path linkedInput = - directories.getExecRoot(TestConstants.WORKSPACE_NAME).getRelative("input.txt"); + Path linkedInput = directories.getExecRoot().getRelative("input.txt"); FileSystemUtils.createDirectoryAndParents(linkedInput.getParentDirectory()); linkedInput.createSymbolicLink(input); outputArtifact = getBinArtifactWithNoOwner("destination.txt"); |