commit c83a701038abe6cb1a6f6ff63fa24982515105e5
author Greg Estren <gregce@google.com> Wed Dec 21 00:05:46 2016 +0000
committer Klaus Aehlig <aehlig@google.com> Wed Dec 21 09:48:49 2016 +0000
tree 1a0c80243d49f5c8154c4c10761d764b0de03275
parent cb9d16a09e742d8c4419773168bfed7abe6b4af5

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

src/main/java/com/google/devtools/build/lib/packages/Package.java

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);
         }
       }

src/main/java/com/google/devtools/build/lib/packages/TestTargetUtils.java

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) {