summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2009-10-15 11:59:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-15 11:59:05 -0700
commitd1a720d06f92a7228f28361a01f3a158c560cd18 (patch)
tree79404ec962633ae231e67ab1874c04a18d392b38
parent4874dcd417d7a07a8e802709c5d6895dc408d422 (diff)
parent9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd (diff)
downloadframeworks_base-d1a720d06f92a7228f28361a01f3a158c560cd18.zip
frameworks_base-d1a720d06f92a7228f28361a01f3a158c560cd18.tar.gz
frameworks_base-d1a720d06f92a7228f28361a01f3a158c560cd18.tar.bz2
am 9e58e642: Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-mr2 * commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd': Enable some tests that requires local http server
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
index 395e572..32219fa 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
@@ -79,8 +79,7 @@ public class FileFilter {
"profiler", // profiler is not supported
"svg", // svg is not supported
"platform", // platform specific
- "http", // requires local http(s) server
- "fast/workers",
+ "http/wml",
};
static final String [] ignoreTestList = {