diff options
author | dsinclair <dsinclair@chromium.org> | 2016-04-20 10:47:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-20 10:47:47 -0700 |
commit | 6b2c4d7d709dbfca0a59ce6310c0941669d0f53e (patch) | |
tree | ba560415daeea4db07efce54a751320608bfc457 /testing/multiprocess_func_list.cc | |
parent | 685bb88433b7520946e30a1e520d37bfc2288151 (diff) | |
download | pdfium-6b2c4d7d709dbfca0a59ce6310c0941669d0f53e.tar.xz |
Upgrade build and clang.
The issue with //testing/multiprocess_func_list has been fixed in upstream
//build. This Cl upgrades //build to ToT.
In order to do so clang must also be updated. The Wno-undefined-var-template
is only passed if the pinned clang revision isn't 266460, which is the
currently pinned clang revision in chromium. This is there so that the bot
that builds with trunk clang gets this flag, but pinned clang doesn't.
We accidentally pickup the flag since our pinned clang is different from the
Chrome version. So, we must always roll //build and clang together when
changing deps or bad things may happen as there is an implicit dependency
due to compile flags.
BUG=pdfium:106
Review URL: https://codereview.chromium.org/1911483002
Diffstat (limited to 'testing/multiprocess_func_list.cc')
-rw-r--r-- | testing/multiprocess_func_list.cc | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/testing/multiprocess_func_list.cc b/testing/multiprocess_func_list.cc deleted file mode 100644 index a400557445..0000000000 --- a/testing/multiprocess_func_list.cc +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "multiprocess_func_list.h" - -#include <map> - -// Helper functions to maintain mapping of "test name"->test func. -// The information is accessed via a global map. -namespace multi_process_function_list { - -namespace { - -struct ProcessFunctions { - ProcessFunctions() : main(NULL), setup(NULL) {} - ProcessFunctions(TestMainFunctionPtr main, SetupFunctionPtr setup) - : main(main), setup(setup) {} - TestMainFunctionPtr main; - SetupFunctionPtr setup; -}; - -typedef std::map<std::string, ProcessFunctions> MultiProcessTestMap; - -// Retrieve a reference to the global 'func name' -> func ptr map. -MultiProcessTestMap& GetMultiprocessFuncMap() { - static MultiProcessTestMap test_name_to_func_ptr_map; - return test_name_to_func_ptr_map; -} - -} // namespace - -AppendMultiProcessTest::AppendMultiProcessTest( - std::string test_name, - TestMainFunctionPtr main_func_ptr, - SetupFunctionPtr setup_func_ptr) { - GetMultiprocessFuncMap()[test_name] = - ProcessFunctions(main_func_ptr, setup_func_ptr); -} - -int InvokeChildProcessTest(std::string test_name) { - MultiProcessTestMap& func_lookup_table = GetMultiprocessFuncMap(); - MultiProcessTestMap::iterator it = func_lookup_table.find(test_name); - if (it != func_lookup_table.end()) { - const ProcessFunctions& process_functions = it->second; - if (process_functions.setup) - (*process_functions.setup)(); - if (process_functions.main) - return (*process_functions.main)(); - } - - return -1; -} - -} // namespace multi_process_function_list |