Skip to content

Commit

Permalink
Remove mentions of middlemen from RewindingTestsHelper.java and Actio…
Browse files Browse the repository at this point in the history
…nRewindStrategy.java .

RELNOTES: None.
PiperOrigin-RevId: 695919563
Change-Id: Iddea7f895f81783c3707cfee9af8794e3f825496
  • Loading branch information
lberki authored and copybara-github committed Nov 13, 2024
1 parent c5e08d4 commit f16737c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ private Set<DerivedArtifact> getLostInputOwningDirectDeps(

if (expandedDeps.contains(Artifact.key(transitiveOwner))) {
// The lost input is included in an aggregation artifact (e.g. a tree artifact or
// fileset) that is included by an aggregation artifact (e.g. a middleman) that the
// fileset) that is included by an aggregation artifact (e.g. a runfiles tree) that the
// action directly depends on.
lostInputOwningDirectDeps.add((DerivedArtifact) transitiveOwner);
foundLostInputDepOwner = true;
Expand All @@ -446,7 +446,7 @@ private Set<DerivedArtifact> getLostInputOwningDirectDeps(

if (expandedDeps.contains(Artifact.key(owner))) {
// The lost input is included in an aggregation artifact (e.g. a tree artifact, fileset,
// or middleman) that the action directly depends on.
// or runfiles tree) that the action directly depends on.
lostInputOwningDirectDeps.add((DerivedArtifact) owner);
foundLostInputDepOwner = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1556,8 +1556,6 @@ final void runTreeFileArtifactRewound(SpawnShim shim) throws Exception {
"Linking tree/libconsumes_tree.so",
"Linking tree/libconsumes_tree.a");

// Rules like cc_library depend on middleman inputs which are part of the toolchain, but none
// are involved in rewinding.
recorder.assertEvents(
/* runOnce= */ ImmutableList.of(
"Compiling tree/make_cc_dir.cc/file2.cc",
Expand Down Expand Up @@ -1666,8 +1664,6 @@ final void runTreeArtifactRewoundWhenTreeFilesLost(
"Linking tree/libconsumes_tree.so",
"Linking tree/libconsumes_tree.a");

// Rules like cc_library depend on middleman inputs which are part of the toolchain, but none
// are involved in rewinding.
recorder.assertEvents(
/* runOnce= */ ImmutableList.of(
"Action tree/make_cc_dir.cc", "Linking tree/libconsumes_tree.a"),
Expand All @@ -1691,7 +1687,7 @@ final void runTreeArtifactRewoundWhenTreeFilesLost(

public final void runGeneratedRunfilesRewound_allFilesLost_spawnFailed() throws Exception {
// This test demonstrates that rewinding works when an action fails due to lost inputs which are
// generated files in the action's runfiles. Rewinding must propagate across the middleman
// generated files in the action's runfiles. Rewinding must propagate across the runfiles tree
// artifacts and actions associated with the runfiles.

ImmutableList<String> lostRunfiles = ImmutableList.of("gen1.dat", "gen2.dat");
Expand Down

0 comments on commit f16737c

Please sign in to comment.