Automated rollback of commit 19de063f1a4074d26d9bdac2ab709fb2f780b29a.
*** Reason for rollback ***
These tests are not as fixed as originally thought
*** Original change description ***
Re-enable tests now that b/129599328 is fixed
PiperOrigin-RevId: 245314318
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index f26a8d8..4a61ad2 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -415,6 +415,10 @@
// Regression test: "output_filter broken (but in a different way)"
@Test
public void testOutputFilterSeeWarning() throws Exception {
+ if (defaultFlags().contains(Flag.TRIMMED_CONFIGURATIONS)) {
+ // TODO(b/129599328): fix or justify disabling
+ return;
+ }
runAnalysisWithOutputFilter(Pattern.compile(".*"));
assertContainsEvent("please do not import '//java/a:A.java'");
}
@@ -426,12 +430,20 @@
// TODO(b/67651960): fix or justify disabling.
return;
}
+ if (defaultFlags().contains(Flag.TRIMMED_CONFIGURATIONS)) {
+ // TODO(b/129599328): fix or justify disabling
+ return;
+ }
runAnalysisWithOutputFilter(Pattern.compile("^//java/c"));
assertNoEvents();
}
@Test
public void testOutputFilterWithDebug() throws Exception {
+ if (defaultFlags().contains(Flag.TRIMMED_CONFIGURATIONS)) {
+ // TODO(b/129599328): fix or justify disabling
+ return;
+ }
scratch.file(
"java/a/BUILD",
"java_library(name = 'a',",
@@ -614,6 +626,10 @@
*/
@Test
public void testMultiBuildInvalidationRevalidation() throws Exception {
+ if (defaultFlags().contains(Flag.TRIMMED_CONFIGURATIONS)) {
+ // TODO(b/129599328): fix or justify disabling
+ return;
+ }
scratch.file("java/a/A.java", "bla1");
scratch.file("java/a/C.java", "bla2");
scratch.file("java/a/BUILD",
