diff options
author | Ben Murdoch <benm@google.com> | 2010-07-09 10:40:22 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-07-09 16:06:40 +0100 |
commit | 177eb38ef571e8602547dfd9ba78376822e18e01 (patch) | |
tree | dbac3d9a548d5e4b8deb8cb48733302c4e24dc76 /tests | |
parent | 2b2fa12cd0aab0d6cc90274525e3ca04905aa593 (diff) | |
download | frameworks_base-177eb38ef571e8602547dfd9ba78376822e18e01.zip frameworks_base-177eb38ef571e8602547dfd9ba78376822e18e01.tar.gz frameworks_base-177eb38ef571e8602547dfd9ba78376822e18e01.tar.bz2 |
Update the file filter in DumpRenderTree (and DumpRenderTree2) so that
we run tests in .xhtml files.
Change-Id: I2af0bd29acef5bafa9dee9292aafc18d77a84080
Diffstat (limited to 'tests')
-rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java | 4 | ||||
-rw-r--r-- | tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java index 0883387..4475e92 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java @@ -77,7 +77,9 @@ public class FsUtils { continue; } - if ((s.toLowerCase().endsWith(".html") || s.toLowerCase().endsWith(".xml")) + if ((s.toLowerCase().endsWith(".html") + || s.toLowerCase().endsWith(".xml") + || s.toLowerCase().endsWith(".xhtml")) && !s.endsWith("TEMPLATE.html")) { Log.v(LOGTAG, "Recording " + s); bos.write(s.getBytes()); diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java index 98801d3..64ef8a4 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/FileFilter.java @@ -227,13 +227,14 @@ public class FileFilter { } /** - * Checks if the file is a test or something else. + * Checks if the file is a test. + * Currently we run .html and .xhtml tests. * * @param testName * @return * if the file is a test */ public static boolean isTestFile(String testName) { - return testName.endsWith(".html"); + return testName.endsWith(".html") || testName.endsWith(".xhtml"); } -}
\ No newline at end of file +} |