summaryrefslogtreecommitdiffstats
path: root/tests/DumpRenderTree2/src/com/android/dumprendertree2
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-11-09 14:37:16 +0000
committerIain Merrick <husky@google.com>2010-11-09 15:44:16 +0000
commitace92b871a020a3d662511ea8b1aab30334015de (patch)
treed14c73f74e2ae1b1cba870b26d932d8826884c6c /tests/DumpRenderTree2/src/com/android/dumprendertree2
parent494081aab9db951714fe4a9938000a7f93edc2ed (diff)
downloadframeworks_base-ace92b871a020a3d662511ea8b1aab30334015de.zip
frameworks_base-ace92b871a020a3d662511ea8b1aab30334015de.tar.gz
frameworks_base-ace92b871a020a3d662511ea8b1aab30334015de.tar.bz2
Include .php tests in DumpRenderTree2.
I've manually checked the existing LayoutTests for false positives. There are non-test .php files, but they're all in "resources" subdirectories, so they should be caught by isTestDir(). Added an extra @warning to isTestFile() just in case. Bug: 3164771 Change-Id: Ib282acf46f6e839439ce521c4b2cb5820fcd263c
Diffstat (limited to 'tests/DumpRenderTree2/src/com/android/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 ebdf9c2..6c33a21 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");
}
/**