diff options
| author |  kchodorow <kchodorow@google.com> | 2017-04-22 15:07:22 -0400 |
|---|---|---|
| committer | Kristina Chodorow <kchodorow@google.com> | 2017-05-23 15:37:55 -0400 |
| commit | 85ae1905d4abfcd214bd53d6cd3d032ff246daf6 (patch) | |
| tree | 38b2220246c55d721cfc8f7d3c6940b154c4b649 /src/main/java/com/google/devtools/build/lib/rules/test | |
| parent | e7e561850428638c7e919eb1cfc850e71748b6dc (diff) | |
Automated g4 rollback of commit c4134802dd15d6ef5cca6521f6bf6aac395ee2ad.
*** Reason for rollback ***
Roll forward of directory name change
*** Original change description ***
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: 156892980
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, 2 insertions, 3 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 df5abb41e9..966a6af311 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,7 +23,6 @@ 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; @@ -93,9 +92,9 @@ public class TestResult { /** * @return Coverage data artifact, if available and null otherwise. */ - public PathFragment getCoverageData() { + public Path getCoverageData() { if (data.getHasCoverage()) { - return testAction.getCoverageData().getExecPath(); + return testAction.getCoverageData().getPath(); } return null; } |