diff options
author | ulfjack <ulfjack@google.com> | 2018-02-06 04:16:34 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-06 04:18:12 -0800 |
commit | ff179a3b3a97cd91037a2d3fb8a9792b1cc96d36 (patch) | |
tree | 0a480b4196a2906a5fd4957844ad0944d11a6ede /src/test/java/com/google/devtools/build | |
parent | 5af519ac126a3df4371b3e8a8bb3cec6ed69c73c (diff) |
Automated rollback of commit 4260c30a03a9b83d48a5e8690aca19cd80be4c38.
*** Reason for rollback ***
Try again with fixes.
*** Original change description ***
Automated rollback of commit 10b0d8aa6b73a024cc007c5e075cb329add878ef.
*** Reason for rollback ***
Breaks Google-internal targets, sadly.
*** Original change description ***
Ban middlemen from runfiles artifacts.
Previous changes have removed all middlemen from runfiles
artifacts. This CL locks it down and removes various now-redundant
*WithoutMiddlemen() methods from Runfiles.
I put a check for middlemen in ConflictChecker.put, which should be a
chokepoint for runfiles arti...
***
PiperOrigin-RevId: 184661375
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java | 13 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java index 952d0130c8..33e3daf0cd 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.analysis; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.RunfilesSupplier; @@ -61,18 +60,6 @@ public class RunfilesSupplierImplTest { } @Test - public void testGetArtifactsFilterMiddlemen() { - List<Artifact> artifacts = mkArtifacts(rootDir, "thing1", "thing2"); - Artifact middleman = new Artifact(PathFragment.create("middleman"), middlemanRoot); - Runfiles runfiles = mkRunfiles(Iterables.concat(artifacts, ImmutableList.of(middleman))); - - RunfilesSupplier underTest = - new RunfilesSupplierImpl(PathFragment.create("notimportant"), runfiles); - - assertThat(underTest.getArtifacts()).containsExactlyElementsIn(artifacts); - } - - @Test public void testGetManifestsWhenNone() { RunfilesSupplier underTest = new RunfilesSupplierImpl(PathFragment.create("ignored"), Runfiles.EMPTY, null); diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java index 55718d40ee..aefd956513 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureTest.java @@ -65,7 +65,7 @@ public class AndroidHostServiceFixtureTest extends AndroidBuildViewTestCase { hostServiceFixture .getProvider(RunfilesProvider.class) .getDefaultRunfiles() - .getArtifactsWithoutMiddlemen())) + .getArtifacts())) .containsExactlyElementsIn( ActionsTestUtil.prettyArtifactNames( getConfiguredTarget("//java/com/server") |