4 files changed, 4 insertions, 7 deletions
diff --git a/tools/runner/java/dalvik/runner/CaliperFinder.java b/tools/runner/java/dalvik/runner/CaliperFinder.java
index 3609471..1facf88 100644
--- a/tools/runner/java/dalvik/runner/CaliperFinder.java
+++ b/tools/runner/java/dalvik/runner/CaliperFinder.java
@@ -25,7 +25,7 @@ import java.io.File;
 class CaliperFinder extends NamingPatternCodeFinder {
 
     @Override protected boolean matches(File file) {
-        return file.getName().endsWith("Benchmark.java");
+        return super.matches(file) && file.getName().endsWith("Benchmark.java");
     }
 
     @Override protected String testName(File file) {
diff --git a/tools/runner/java/dalvik/runner/JUnitFinder.java b/tools/runner/java/dalvik/runner/JUnitFinder.java
index 131a8cf..ba80ac1 100644
--- a/tools/runner/java/dalvik/runner/JUnitFinder.java
+++ b/tools/runner/java/dalvik/runner/JUnitFinder.java
@@ -24,7 +24,7 @@ import java.io.File;
 class JUnitFinder extends NamingPatternCodeFinder {
 
     @Override protected boolean matches(File file) {
-        return file.getName().endsWith("Test.java");
+        return super.matches(file) && file.getName().endsWith("Test.java");
     }
 
     // TODO: try to get names for each method?
diff --git a/tools/runner/java/dalvik/runner/MainFinder.java b/tools/runner/java/dalvik/runner/MainFinder.java
index 282969f..0923f53 100644
--- a/tools/runner/java/dalvik/runner/MainFinder.java
+++ b/tools/runner/java/dalvik/runner/MainFinder.java
@@ -23,10 +23,6 @@ import java.io.File;
  */
 class MainFinder extends NamingPatternCodeFinder {
 
-    @Override protected boolean matches(File file) {
-        return file.getName().endsWith(".java");
-    }
-
     @Override protected String testName(File file) {
         return "main";
     }
diff --git a/tools/runner/java/dalvik/runner/NamingPatternCodeFinder.java b/tools/runner/java/dalvik/runner/NamingPatternCodeFinder.java
index 19c9df2..ae8309f 100644
--- a/tools/runner/java/dalvik/runner/NamingPatternCodeFinder.java
+++ b/tools/runner/java/dalvik/runner/NamingPatternCodeFinder.java
@@ -44,7 +44,8 @@ abstract class NamingPatternCodeFinder implements CodeFinder {
      * Returns true if {@code file} contains a test class of this type.
      */
     protected boolean matches(File file) {
-        return file.getName().endsWith(".java");
+        return (!file.getName().startsWith(".")
+                && file.getName().endsWith(".java"));
     }
 
     protected abstract String testName(File file);