diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 08:23:31 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 08:23:31 +0000 |
| commit | 101132bcad02bc1dbc4d4e93f411ae27a8ba9eb3 (patch) | |
| tree | 908534f88116bf1bbc049bfa9555576fdc1f885a /chrome/test/nacl | |
| parent | 5f40f427afaa490e1a915770feeefd1da3ea8f97 (diff) | |
| download | chromium_src-101132bcad02bc1dbc4d4e93f411ae27a8ba9eb3.zip chromium_src-101132bcad02bc1dbc4d4e93f411ae27a8ba9eb3.tar.gz chromium_src-101132bcad02bc1dbc4d4e93f411ae27a8ba9eb3.tar.bz2 | |
Enable NaCl UI test to test basic integration between Chrome and NaCl
Contains NaCl roll as well to pick up the test data.
TBR=noelallen
Review URL: http://codereview.chromium.org/6275007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_ui_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/nacl/nacl_ui_test.cc b/chrome/test/nacl/nacl_ui_test.cc index ab64f78..0311b98 100644 --- a/chrome/test/nacl/nacl_ui_test.cc +++ b/chrome/test/nacl/nacl_ui_test.cc @@ -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 @@ TEST_F(NaClUITest, ServerTest) { 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 @@ TEST_F(NaClUITest, DISABLED_NpapiHwTest) { 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) { +// FilePath test_file(kSrpcHwHtmlFileName); +// RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms()); +// } |