AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix inspector test in components build

Browse Source 
R=jgruber@chromium.org,machenbach@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2421303002
Cr-Commit-Position: refs/heads/master@{#40410}
This commit is contained in:
jochen 2016-10-18 13:07:41 -07:00 committed by Commit bot
parent 669a084a2b
commit d1daae6221
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils.h
View File

@ -1150,9 +1150,9 @@ inline void MemsetPointer(T** dest, U* value, int counter) {
// Simple support to read a file into a 0-terminated C-string.
// The returned buffer must be freed by the caller.
// On return, *exits tells whether the file existed.
Vector<const char> ReadFile(const char* filename,
bool* exists,
bool verbose = true);
V8_EXPORT_PRIVATE Vector<const char> ReadFile(const char* filename,
bool* exists,
bool verbose = true);
Vector<const char> ReadFile(FILE* file,
bool* exists,
bool verbose = true);

10
test/inspector/BUILD.gn
View File

@ -23,19 +23,13 @@ if (v8_enable_inspector_override) {
]
deps = [
"../..:v8",
"../..:v8_libbase",
"../..:v8_libplatform",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
]
if (is_component_build) {
# inspector-test can't be built against a shared library, so we
# need to depend on the underlying static target in that case.
deps += [ "../..:v8_maybe_snapshot" ]
} else {
deps += [ "../..:v8" ]
}
cflags = []
ldflags = []
}

2
test/inspector/inspector-test.cc
View File

@ -250,7 +250,7 @@ int main(int argc, char* argv[]) {
v8::V8::InitializeICUDefaultLocation(argv[0]);
v8::Platform* platform = v8::platform::CreateDefaultPlatform();
v8::V8::InitializePlatform(platform);
v8::internal::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
v8::V8::SetFlagsFromCommandLine(&argc, argv, true);
v8::V8::InitializeExternalStartupData(argv[0]);
v8::V8::Initialize();

10
test/inspector/inspector.gyp
View File

@ -14,6 +14,7 @@
'dependencies': [
'../../src/v8.gyp:v8_libplatform',
'../../src/v8.gyp:v8_libbase',
'../../src/v8.gyp:v8',
],
'include_dirs': [
'../..',
@ -25,15 +26,6 @@
'task-runner.cc',
'task-runner.h',
],
'conditions': [
['component=="shared_library"', {
# inspector-test can't be built against a shared library, so we
# need to depend on the underlying static target in that case.
'dependencies': ['../../src/v8.gyp:v8_maybe_snapshot'],
}, {
'dependencies': ['../../src/v8.gyp:v8'],
}],
],
},
],
'conditions': [