Merge change I6618182f

* changes:
  Fix CoreTestRunner to not run filtered-out tests.

2 files changed, 6 insertions, 10 deletions

diff --git a/luni/src/test/java/com/google/coretests/CoreTestRunner.java b/luni/src/test/java/com/google/coretests/CoreTestRunner.java
index 82e9f54..ad766aa 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestRunner.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestRunner.java
@@ -138,7 +138,7 @@ public class CoreTestRunner extends TestRunner {
                 ? new XmlReportPrinter(coreTestSuite)
                 : null;
 
-        TestResult result = super.doRun(suite, wait);
+        TestResult result = super.doRun(coreTestSuite, wait);
 
         if (xmlReportPrinter != null) {
             System.out.print("Printing XML Reports... ");
diff --git a/luni/src/test/java/com/google/coretests/CoreTestSuite.java b/luni/src/test/java/com/google/coretests/CoreTestSuite.java
index 1828c57..fd7531f 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestSuite.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestSuite.java
@@ -183,17 +183,13 @@ public class CoreTestSuite implements Test {
                 }
             }
         } else if (test instanceof TestCase) {
-            TestCase caze = (TestCase)test;
+            TestCase testCase = (TestCase)test;
             boolean ignoreMe = false;
 
-            boolean isAndroidOnly = hasAnnotation(caze, 
-                    AndroidOnly.class);
-            boolean isBrokenTest = hasAnnotation(caze, 
-                    BrokenTest.class);
-            boolean isKnownFailure = hasAnnotation(caze, 
-                    KnownFailure.class);
-            boolean isSideEffect = hasAnnotation(caze, 
-                    SideEffect.class);
+            boolean isAndroidOnly = hasAnnotation(testCase, AndroidOnly.class);
+            boolean isBrokenTest = hasAnnotation(testCase, BrokenTest.class);
+            boolean isKnownFailure = hasAnnotation(testCase, KnownFailure.class);
+            boolean isSideEffect = hasAnnotation(testCase, SideEffect.class);
             boolean isNormalTest = 
                     !(isAndroidOnly || isBrokenTest || isKnownFailure ||
                       isSideEffect);