diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 16:39:43 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 16:39:43 +0000 |
| commit | 610e9e3e9b663256f3e1b95e385b3b6c0ffffe46 (patch) | |
| tree | 5aeb37e696e941fe6b28cf964b2cbb72f54e24fb /ppapi/native_client/tests | |
| parent | ed6be77baa707bdc3746da9dd5f3c14c8972295b (diff) | |
| download | chromium_src-610e9e3e9b663256f3e1b95e385b3b6c0ffffe46.zip chromium_src-610e9e3e9b663256f3e1b95e385b3b6c0ffffe46.tar.gz chromium_src-610e9e3e9b663256f3e1b95e385b3b6c0ffffe46.tar.bz2 | |
Revert 110221 - Test NaCl version of ppapi_tests via ui_tests
Copy server pieces to build output dir.
Update ppapi_uitests.cc to run server from output dir.
Add test to ppapi_uitests, update dependecies.
Update test_sever to support a fully qualified path.
BUG= http://code.google.com/p/chromium/issues/detail?id=96782
BUG= http://code.google.com/p/chromium/issues/detail?id=103690
TEST= try (ui_tests --gtest_filter="PPAPI*.*")
Review URL: http://codereview.chromium.org/8539019
TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8486017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client/tests')
| -rw-r--r-- | ppapi/native_client/tests/ppapi_tests/test_case.nmf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/native_client/tests/ppapi_tests/test_case.nmf b/ppapi/native_client/tests/ppapi_tests/test_case.nmf index f0bb249..3528855 100644 --- a/ppapi/native_client/tests/ppapi_tests/test_case.nmf +++ b/ppapi/native_client/tests/ppapi_tests/test_case.nmf @@ -1,7 +1,7 @@ { "program": { - "x86-64": {"url": "ppapi_nacl_tests_newlib_x64.nexe"}, - "x86-32": {"url": "ppapi_nacl_tests_newlib_x32.nexe"}, - "arm": {"url": "ppapi_nacl_tests_newlib_arm.nexe"} + "x86-64": {"url": "ppapi_tests_x86-64.nexe"}, + "x86-32": {"url": "ppapi_tests_x86-32.nexe"}, + "arm": {"url": "ppapi_tests_arm.nexe"} } } |