Remove dead code referencing deleted "suites" attribute. This used to be how test_suites depended on other test_suites. Now they just go in "tests". -- PiperOrigin-RevId: 142607603 MOS_MIGRATED_REVID=142607603
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java index 7e1fca4..dc84c5d 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Package.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -1311,9 +1311,7 @@ for (Rule rule : rules) { AttributeMap attributes = NonconfigurableAttributeMapper.of(rule); if (rule.getRuleClass().equals("test_suite") - && attributes.get("tests", BuildType.LABEL_LIST).isEmpty() - && (!attributes.has("suites", BuildType.LABEL_LIST) - || attributes.get("suites", BuildType.LABEL_LIST).isEmpty())) { + && attributes.get("tests", BuildType.LABEL_LIST).isEmpty()) { rule.setAttributeValueByName("$implicit_tests", allTests); } }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/TestTargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TestTargetUtils.java index eb5755c..8a6dafc 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/TestTargetUtils.java +++ b/src/main/java/com/google/devtools/build/lib/packages/TestTargetUtils.java
@@ -257,9 +257,6 @@ // Note that testsAndSuites can contain input file targets; the test_suite rule does not // restrict the set of targets that can appear in tests or suites. testsAndSuites.addAll(getPrerequisites(testSuite, "tests")); - if (testSuite.getRuleClassObject().hasAttr("suites", BuildType.LABEL_LIST)) { - testsAndSuites.addAll(getPrerequisites(testSuite, "suites")); - } // 1. Add all tests for (Target test : testsAndSuites) {
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/TestsFunction.java b/src/main/java/com/google/devtools/build/lib/query2/engine/TestsFunction.java index d802edd..956e604 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/engine/TestsFunction.java +++ b/src/main/java/com/google/devtools/build/lib/query2/engine/TestsFunction.java
@@ -201,7 +201,6 @@ // Note that testsAndSuites can contain input file targets; the test_suite rule does not // restrict the set of targets that can appear in tests or suites. testsAndSuites.addAll(getPrerequisites(testSuite, "tests")); - testsAndSuites.addAll(getPrerequisites(testSuite, "suites")); // 1. Add all tests for (T test : testsAndSuites) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CoverageCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CoverageCommand.java index 4b1471b..2e9e9de 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CoverageCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CoverageCommand.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.BuildType; -import com.google.devtools.build.lib.packages.NoSuchThingException; import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; @@ -255,17 +254,6 @@ // Add package-based filters for all tests in the test suite. packageFilters.add(getInstrumentedPrefix(label.getPackageName())); } - for (Label label : attributes.get("suites", BuildType.LABEL_LIST)) { - try { - // Recursively process all nested test suites. - collectInstrumentedPackages(env, - ImmutableList.of(env.getPackageManager().getTarget(env.getReporter(), label)), - packageFilters); - } catch (NoSuchThingException e) { - // Do nothing - we can't get package name to add to the filter and real error - // will be reported later during actual build. - } - } } } }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java index 18a747e..24fc760 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
@@ -75,9 +75,6 @@ // Note that testsAndSuites can contain input file targets; the test_suite rule does not // restrict the set of targets that can appear in tests or suites. builder.mergeError(getPrerequisites(env, testSuite, "tests", testsAndSuites)); - if (testSuite.getRuleClassObject().hasAttr("suites", BuildType.LABEL_LIST)) { - builder.mergeError(getPrerequisites(env, testSuite, "suites", testsAndSuites)); - } // 1. Add all tests for (Target test : testsAndSuites) {