mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-27 15:32:10 +08:00
50ed179e9a
Use BUILDFLAG(IS_*) instead of defined(OS_*).
This was generated mostly mechnically by performing the following steps:
- sed -i '' -E -e 's/defined\(OS_/BUILDFLAG(IS_/g' \
-e 's%([ !])OS_([A-Z]+)%\1BUILDFLAG(IS_\2)%g' \
$(git grep -l 'OS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- sed -i '' -e 's/#ifdef BUILDFLAG(/#if BUILDFLAG(/' \
$(git grep -l '#ifdef BUILDFLAG('
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- gsed -i -z -E -e \
's%(.*)#include "%\1#include "build/buildflag.h"\n#include "%' \
$(git grep -l 'BUILDFLAG(IS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- Spot checks to move #include "build/buildflag.h" to the correct parts
of files.
- sed -i '' -E -e \
's%^(#include "build/buildflag.h")$%#include "build/build_config.h"\n\1%' \
$(grep -L '^#include "build/build_config.h"$'
$(git grep -l 'BUILDFLAG(IS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm'))
- Add “clang-format off” around tool usage messages.
- git cl format
- Update mini_chromium to 85ba51f98278 (intermediate step).
TESTING ONLY).
- for f in $(git grep -l '^#include "build/buildflag.h"$'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm'); do \
grep -v '^#include "build/buildflag.h"$' "${f}" > /tmp/z; \
cp /tmp/z "${f}"; done
- git cl format
- Update mini_chromium to 735143774c5f (intermediate step).
- Update mini_chromium to f41420eb45fa (as checked in).
- Update mini_chromium to 6e2f204b4ae1 (as checked in).
For ease of review and inspection, each of these steps is uploaded as a
new patch set in a review series.
This includes an update of mini_chromium to 6e2f204b4ae1:
f41420eb45fa Use BUILDFLAG for OS checking
6e2f204b4ae1 Include what you use: string_util.h uses build_config.h
Bug: chromium:1234043
Change-Id: Ieef86186f094c64e59b853729737e36982f8cf69
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3400258
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
76 lines
2.5 KiB
C++
76 lines
2.5 KiB
C++
// Copyright 2018 The Crashpad Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "test/multiprocess_exec.h"
|
|
|
|
#include <map>
|
|
|
|
#include "base/check.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "build/build_config.h"
|
|
#include "test/main_arguments.h"
|
|
#include "test/test_paths.h"
|
|
#include "util/stdlib/map_insert.h"
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
|
|
namespace internal {
|
|
|
|
namespace {
|
|
|
|
std::map<std::string, int(*)()>* GetMultiprocessFunctionMap() {
|
|
static auto* map = new std::map<std::string, int(*)()>();
|
|
return map;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
AppendMultiprocessTest::AppendMultiprocessTest(const std::string& test_name,
|
|
int (*main_function_pointer)()) {
|
|
CHECK(MapInsertOrReplace(
|
|
GetMultiprocessFunctionMap(), test_name, main_function_pointer, nullptr))
|
|
<< test_name << " already registered";
|
|
}
|
|
|
|
int CheckedInvokeMultiprocessChild(const std::string& test_name) {
|
|
const auto* functions = internal::GetMultiprocessFunctionMap();
|
|
auto it = functions->find(test_name);
|
|
CHECK(it != functions->end())
|
|
<< "child main " << test_name << " not registered";
|
|
return (*it->second)();
|
|
}
|
|
|
|
} // namespace internal
|
|
|
|
void MultiprocessExec::SetChildTestMainFunction(
|
|
const std::string& function_name) {
|
|
std::vector<std::string> rest(GetMainArguments().begin() + 1,
|
|
GetMainArguments().end());
|
|
rest.push_back(internal::kChildTestFunction + function_name);
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
// Instead of using argv[0] on Windows, use the actual binary name. This is
|
|
// necessary because if originally the test isn't run with ".exe" on the
|
|
// command line, then argv[0] also won't include ".exe". This argument is used
|
|
// as the lpApplicationName argument to CreateProcess(), and so will fail.
|
|
SetChildCommand(TestPaths::Executable(), &rest);
|
|
#else
|
|
SetChildCommand(base::FilePath(GetMainArguments()[0]), &rest);
|
|
#endif
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace crashpad
|