From 610e9e3e9b663256f3e1b95e385b3b6c0ffffe46 Mon Sep 17 00:00:00 2001 From: "dmichael@chromium.org" Date: Wed, 16 Nov 2011 16:39:43 +0000 Subject: 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 --- net/test/test_server.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'net/test') diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 918e1b6..4850f4f 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -274,11 +274,7 @@ void TestServer::Init(const FilePath& document_root) { FilePath src_dir; PathService::Get(base::DIR_SOURCE_ROOT, &src_dir); - if (document_root.IsAbsolute()) { - document_root_ = document_root; - } else { - document_root_ = src_dir.Append(document_root); - } + document_root_ = src_dir.Append(document_root); certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net")) .Append(FILE_PATH_LITERAL("data")) -- cgit v1.1