summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Iain Merrick <husky@google.com> 2010-11-09 08:15:33 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-11-09 08:15:33 -0800
commitdfa448f759e0e91b788e2620a4cf7187b893d24e (patch)
treea61ea3e0671b335be4153bfebab92368cc4e1d77
parente8934a6774580ef8e56801bd2c680b72b0f84827 (diff)
parentace92b871a020a3d662511ea8b1aab30334015de (diff)
Merge "Include .php tests in DumpRenderTree2."
-rw-r--r--tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java
index ebdf9c2f0818..6c33a21fb790 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java
@@ -240,13 +240,18 @@ public class FileFilter {
/**
* Checks if the file is a test.
- * Currently we run .html and .xhtml tests.
+ * Currently we run .html, .xhtml and .php tests.
+ *
+ * @warning You MUST also call isTestDir() on the parent directory before
+ * assuming that a file is a test.
*
* @param testName
* @return if the file is a test
*/
public static boolean isTestFile(String testName) {
- return testName.endsWith(".html") || testName.endsWith(".xhtml");
+ return testName.endsWith(".html")
+ || testName.endsWith(".xhtml")
+ || testName.endsWith(".php");
}
/**