From ace92b871a020a3d662511ea8b1aab30334015de Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Tue, 9 Nov 2010 14:37:16 +0000 Subject: 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 --- .../src/com/android/dumprendertree2/FileFilter.java | 9 +++++++-- 1 file 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"); } /** -- cgit v1.1