aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java84
1 files changed, 41 insertions, 43 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
index 39f5fdce81..5031184a5d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java
@@ -139,13 +139,14 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
return;
}
useConfiguration("--cpu=k8");
- scratch.file("conflict/BUILD",
+ scratch.file(
+ "conflict/BUILD",
"cc_library(name='x', srcs=['foo.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])",
- "cc_binary(name='foo', deps=['x'], data=['_objs/x/conflict/foo.pic.o'])");
+ "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])",
+ "cc_binary(name='foo', deps=['x'], data=['_objs/x/foo.pic.o'])");
reporter.removeHandler(failFastHandler); // expect errors
update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:foo");
- assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+ assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
assertThat(getAnalysisResult().getTargetsToBuild()).isEmpty();
}
@@ -161,22 +162,23 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
@Test
public void testNoActionConflictWithInvalidatedTarget() throws Exception {
useConfiguration("--cpu=k8");
- scratch.file("conflict/BUILD",
+ scratch.file(
+ "conflict/BUILD",
"cc_library(name='x', srcs=['foo.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.o', srcs=['bar.cc'])");
+ "cc_binary(name='_objs/x/foo.o', srcs=['bar.cc'])");
update("//conflict:x");
ConfiguredTarget conflict = getConfiguredTarget("//conflict:x");
- Action oldAction = getGeneratingAction(getBinArtifact("_objs/x/conflict/foo.pic.o", conflict));
+ Action oldAction = getGeneratingAction(getBinArtifact("_objs/x/foo.pic.o", conflict));
assertThat(oldAction.getOwner().getLabel().toString()).isEqualTo("//conflict:x");
- scratch.overwriteFile("conflict/BUILD",
+ scratch.overwriteFile(
+ "conflict/BUILD",
"cc_library(name='newx', srcs=['foo.cc'])", // Rename target.
- "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
- update(defaultFlags(), "//conflict:_objs/x/conflict/foo.pic.o");
- ConfiguredTarget objsConflict = getConfiguredTarget("//conflict:_objs/x/conflict/foo.pic.o");
- Action newAction =
- getGeneratingAction(getBinArtifact("_objs/x/conflict/foo.pic.o", objsConflict));
+ "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
+ update(defaultFlags(), "//conflict:_objs/x/foo.pic.o");
+ ConfiguredTarget objsConflict = getConfiguredTarget("//conflict:_objs/x/foo.pic.o");
+ Action newAction = getGeneratingAction(getBinArtifact("_objs/x/foo.pic.o", objsConflict));
assertThat(newAction.getOwner().getLabel().toString())
- .isEqualTo("//conflict:_objs/x/conflict/foo.pic.o");
+ .isEqualTo("//conflict:_objs/x/foo.pic.o");
}
/**
@@ -189,13 +191,13 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
return;
}
useConfiguration("--cpu=k8");
- scratch.file("conflict/BUILD",
+ scratch.file(
+ "conflict/BUILD",
"cc_library(name='x', srcs=['foo.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
+ "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
reporter.removeHandler(failFastHandler); // expect errors
- update(defaultFlags().with(Flag.KEEP_GOING),
- "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
- assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+ update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
+ assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
}
@Test
@@ -205,23 +207,23 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
return;
}
useConfiguration("--cpu=k8");
- scratch.file("conflict/BUILD",
- "cc_library(name='x', srcs=['foo.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
+ scratch.file(
+ "conflict/BUILD",
+ "cc_library(name='x', srcs=['foo.cc'])",
+ "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
reporter.removeHandler(failFastHandler); // expect errors
- update(defaultFlags().with(Flag.KEEP_GOING),
- "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
+ update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
// We want to force a "dropConfiguredTargetsNow" operation, which won't inform the
// invalidation receiver about the dropped configured targets.
skyframeExecutor.clearAnalysisCache(
ImmutableList.<ConfiguredTarget>of(), ImmutableSet.<AspectValue>of());
- assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+ assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
eventCollector.clear();
- scratch.overwriteFile("conflict/BUILD",
+ scratch.overwriteFile(
+ "conflict/BUILD",
"cc_library(name='x', srcs=['baz.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
- update(defaultFlags().with(Flag.KEEP_GOING),
- "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
+ "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
+ update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
assertNoEvents();
}
@@ -239,14 +241,11 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
scratch.file(
"conflict/BUILD",
"cc_library(name='x', srcs=['foo.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.pic.o', srcs=['bar.cc'])");
+ "cc_binary(name='_objs/x/foo.pic.o', srcs=['bar.cc'])");
reporter.removeHandler(failFastHandler); // expect errors
- update(
- defaultFlags().with(Flag.KEEP_GOING),
- "//conflict:x",
- "//conflict:_objs/x/conflict/foo.pic.o");
+ update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
- assertContainsEvent("file 'conflict/_objs/x/conflict/foo.pic.o' " + CONFLICT_MSG);
+ assertContainsEvent("file 'conflict/_objs/x/foo.pic.o' " + CONFLICT_MSG);
assertDoesNotContainEvent("MandatoryInputs");
assertDoesNotContainEvent("Outputs");
}
@@ -266,13 +265,12 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
"conflict/BUILD",
"cc_library(name='x', srcs=['foo1.cc', 'foo2.cc', 'foo3.cc', 'foo4.cc', 'foo5.cc'"
+ ", 'foo6.cc'])",
- "genrule(name = 'foo', outs=['_objs/x/conflict/foo1.pic.o'], srcs=['foo1.cc', 'foo2.cc', "
+ "genrule(name = 'foo', outs=['_objs/x/foo1.pic.o'], srcs=['foo1.cc', 'foo2.cc', "
+ "'foo3.cc', 'foo4.cc', 'foo5.cc', 'foo6.cc'], cmd='', output_to_bindir=1)");
reporter.removeHandler(failFastHandler); // expect errors
update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:foo");
- Event event =
- assertContainsEvent("file 'conflict/_objs/x/conflict/foo1.pic.o' " + CONFLICT_MSG);
+ Event event = assertContainsEvent("file 'conflict/_objs/x/foo1.pic.o' " + CONFLICT_MSG);
assertContainsEvent("MandatoryInputs");
assertContainsEvent("Outputs");
@@ -298,14 +296,14 @@ public class AnalysisCachingTest extends AnalysisCachingTestBase {
return;
}
useConfiguration("--cpu=k8");
- scratch.file("conflict/BUILD",
+ scratch.file(
+ "conflict/BUILD",
"cc_library(name='x', srcs=['foo.cc'])",
- "cc_binary(name='_objs/x/conflict/foo.o', srcs=['bar.cc'])");
+ "cc_binary(name='_objs/x/foo.o', srcs=['bar.cc'])");
reporter.removeHandler(failFastHandler); // expect errors
- update(defaultFlags().with(Flag.KEEP_GOING),
- "//conflict:x", "//conflict:_objs/x/conflict/foo.pic.o");
+ update(defaultFlags().with(Flag.KEEP_GOING), "//conflict:x", "//conflict:_objs/x/foo.pic.o");
ConfiguredTarget a = getConfiguredTarget("//conflict:x");
- ConfiguredTarget b = getConfiguredTarget("//conflict:_objs/x/conflict/foo.pic.o");
+ ConfiguredTarget b = getConfiguredTarget("//conflict:_objs/x/foo.pic.o");
assertThat(hasTopLevelAnalysisError(a) ^ hasTopLevelAnalysisError(b)).isTrue();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 01:47:59 +0000