diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 00:19:12 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 00:19:12 +0000 |
| commit | 83a8286188608c533d111358a0fbcd10eb958954 (patch) | |
| tree | 1109adb084ff7558d108df0e03283b2bc5a3c26a /net/test | |
| parent | 53c9a2bd0d3db088e3ed8566f40ad31001c200ac (diff) | |
| download | chromium_src-83a8286188608c533d111358a0fbcd10eb958954.zip chromium_src-83a8286188608c533d111358a0fbcd10eb958954.tar.gz chromium_src-83a8286188608c533d111358a0fbcd10eb958954.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 4850f4f..918e1b6 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -274,7 +274,11 @@ void TestServer::Init(const FilePath& document_root) { FilePath src_dir; PathService::Get(base::DIR_SOURCE_ROOT, &src_dir); - document_root_ = src_dir.Append(document_root); + if (document_root.IsAbsolute()) { + document_root_ = document_root; + } else { + document_root_ = src_dir.Append(document_root); + } certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net")) .Append(FILE_PATH_LITERAL("data")) |