summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl
diff options
context:
space:
mode:
authorsehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-25 19:39:01 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-25 19:39:01 +0000
commit8fa5d361f3b6269b5730c7390012804018885d9f (patch)
tree18caf27879714e73def20d4c9373d03906b6ca8c /chrome/test/nacl
parent6b2f7a8c4ca23b35ef56246a7a86b0d414ac89ea (diff)
downloadchromium_src-8fa5d361f3b6269b5730c7390012804018885d9f.zip
chromium_src-8fa5d361f3b6269b5730c7390012804018885d9f.tar.gz
chromium_src-8fa5d361f3b6269b5730c7390012804018885d9f.tar.bz2
Disable nacl_ui_tests until turbulence over nacl=/src=... and SRPC/PPAPI is
through. BUG=none TEST=none Review URL: http://codereview.chromium.org/6897048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r--chrome/test/nacl/nacl_ui_test.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/test/nacl/nacl_ui_test.cc b/chrome/test/nacl/nacl_ui_test.cc
index 939a8b5..df9016f 100644
--- a/chrome/test/nacl/nacl_ui_test.cc
+++ b/chrome/test/nacl/nacl_ui_test.cc
@@ -36,7 +36,11 @@ NaClUITest::NaClUITest() {
NaClUITest::~NaClUITest() {
}
-TEST_F(NaClUITest, ServerTest) {
+/* None of these tests are enabled anymore, and the test framework seems
+ * not to be a good fit for nacl testing anyway.
+ * TODO(sehr): remove nacl_ui_test.cc entirely once the buildbots don't use it.
+ */
+TEST_F(NaClUITest, DISABLED_ServerTest) {
FilePath test_file(kServerHtmlFileName);
RunTest(test_file, TestTimeouts::action_max_timeout_ms());
}
@@ -82,4 +86,3 @@ TEST_F(NaClUITest, DISABLED_NpapiHwTest) {
// FilePath test_file(kSrpcHwHtmlFileName);
// RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms());
// }
-