diff options
| author |  Greg Estren <gregce@google.com> | 2016-11-18 21:00:07 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-11-21 19:39:05 +0000 |
| commit | 1b80c995d0de47a6d532617289bcfce36edee9e9 (patch) | |
| tree | a7b7247268d06855d30a250f1484ccc3127dccce /src/test/java/com/google/devtools/build/lib | |
| parent | 7f8e0456efe58711aae98c95c6a9dfb57824b9c2 (diff) | |
Fixes test infrastructure bug that wrongly trims output paths
for untrimmed dynamic configs.
--
MOS_MIGRATED_REVID=139612917
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 62889d5f54..c2a6a1a29d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -1159,7 +1159,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * <p>This should be used for targets use configurations with C++ fragments. */ protected String stripCppPrefixForDynamicConfigs(String outputPath) { - return targetConfig.useDynamicConfigurations() + return targetConfig.trimConfigurations() ? AnalysisTestUtil.OUTPUT_PATH_CPP_PREFIX_PATTERN.matcher(outputPath).replaceFirst("") : outputPath; } |