Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: chrome/test/nacl/nacl_ui_test.cc

Issue 6275007: Enable NaCl UI test to test basic integration between Chrome and NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_ui_test.cc
===================================================================
--- chrome/test/nacl/nacl_ui_test.cc (revision 71894)
+++ chrome/test/nacl/nacl_ui_test.cc (working copy)
@@ -12,8 +12,8 @@
namespace {
// NOTE: The base URL of each HTML file is specified in nacl_test.
-const FilePath::CharType kSrpcHwHtmlFileName[] =
- FILE_PATH_LITERAL("srpc_hw.html");
+const FilePath::CharType kPPAPIHwHtmlFileName[] =
+ FILE_PATH_LITERAL("srpc_hw_ppapi.html");
const FilePath::CharType kSrpcBasicHtmlFileName[] =
FILE_PATH_LITERAL("srpc_basic.html");
const FilePath::CharType kSrpcSockAddrHtmlFileName[] =
@@ -41,8 +41,8 @@
RunTest(test_file, TestTimeouts::action_max_timeout_ms());
}
-TEST_F(NaClUITest, DISABLED_SrpcHelloWorld) {
- FilePath test_file(kSrpcHwHtmlFileName);
+TEST_F(NaClUITest, PPAPIHelloWorld) {
+ FilePath test_file(kPPAPIHwHtmlFileName);
RunTest(test_file, TestTimeouts::action_max_timeout_ms());
}
@@ -77,8 +77,8 @@
RunTest(test_file, TestTimeouts::action_max_timeout_ms());
}
-TEST_F(NaClUITest, DISABLED_MultiarchTest) {
- FilePath test_file(kSrpcHwHtmlFileName);
- RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms());
-}
+// TEST_F(NaClUITest, DISABLED_MultiarchTest) {
noelallen_use_chromium 2011/01/20 09:39:57 Could you add a comment as to why this was disable
+// FilePath test_file(kSrpcHwHtmlFileName);
+// RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms());
+// }
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698