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/main/java/com/google/devtools/build/lib/rules/test | |
| 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/main/java/com/google/devtools/build/lib/rules/test')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java index 57bf9fa505..8b6015d9da 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.rules.test.TestRunnerAction.ResolvedPaths; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus; import com.google.devtools.build.lib.view.test.TestStatus.TestResultData; import java.util.Collection; @@ -92,9 +93,9 @@ public class TestResult { /** * @return Coverage data artifact, if available and null otherwise. */ - public Path getCoverageData() { + public PathFragment getCoverageData() { if (data.getHasCoverage()) { - return testAction.getCoverageData().getPath(); + return testAction.getCoverageData().getExecPath(); } return null; } |