diff options
| author |  lberki <lberki@google.com> | 2017-07-18 16:40:00 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-19 10:20:09 +0200 |
| commit | c8c988a8f7e0cdb94d2991f7a4bad14af446223e (patch) | |
| tree | 70861ab648b76dc5a254021927859357bfc05683 /src/test | |
| parent | 7f08537baad5f9f7ccab75ed35cadf4f22ccd86c (diff) | |
Don't differentiate genfiles and bin in artifactsToStrings().
This fixes the majority of Java test failures with --noexperimental_separate_genfiles_directory .
RELNOTES: None.
PiperOrigin-RevId: 162350591
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java index f710c33ba0..e04eae3c67 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java @@ -412,9 +412,10 @@ public final class AnalysisTestUtil { rootMap.put( targetConfiguration.getBinDirectory(RepositoryName.MAIN).getPath().toString(), "bin"); + // In preparation for merging genfiles/ and bin/, we don't differentiate them in tests anymore rootMap.put( targetConfiguration.getGenfilesDirectory(RepositoryName.MAIN).getPath().toString(), - "genfiles"); + "bin"); rootMap.put( targetConfiguration.getMiddlemanDirectory(RepositoryName.MAIN).getPath().toString(), "internal"); @@ -423,9 +424,10 @@ public final class AnalysisTestUtil { rootMap.put( hostConfiguration.getBinDirectory(RepositoryName.MAIN).getPath().toString(), "bin(host)"); + // In preparation for merging genfiles/ and bin/, we don't differentiate them in tests anymore rootMap.put( hostConfiguration.getGenfilesDirectory(RepositoryName.MAIN).getPath().toString(), - "genfiles(host)"); + "bin(host)"); rootMap.put( hostConfiguration.getMiddlemanDirectory(RepositoryName.MAIN).getPath().toString(), "internal(host)"); |