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

[inspector] Remove inspector_protocol_parser_test target.

Browse Source 
This target introduces a dependency on WebKit/platform which is not the way we want it.
Keeping the build files in src/inspector, as they are not used and will be useful later on.

BUG=none
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2239603002
Cr-Commit-Position: refs/heads/master@{#38587}
This commit is contained in:
dgozman 2016-08-11 09:44:48 -07:00 committed by Commit bot
parent dc38437291
commit ab53a8b9ec
12 changed files with 36 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gypfiles/all.gyp
View File

@ -22,7 +22,6 @@
'../samples/samples.gyp:*',
'../test/cctest/cctest.gyp:*',
'../test/fuzzer/fuzzer.gyp:*',
'../test/inspector_protocol_parser_test/inspector_protocol_parser_test.gyp:*',
'../test/unittests/unittests.gyp:*',
],
}],

67
src/inspector/BUILD.gn
View File

@ -36,7 +36,7 @@ action("inspector_protocol_sources") {
"--protocol",
rebase_path("js_protocol.json", root_build_dir),
"--string_type",
"String",
"String16",
"--export_macro",
"PLATFORM_EXPORT",
"--output_dir",
@ -51,12 +51,8 @@ action("inspector_protocol_sources") {
}
config("inspector_protocol_config") {
include_dirs = [
"$protocol_path/../..",
]
defines = [
"V8_INSPECTOR_USE_STL"
]
include_dirs = [ "$protocol_path/../.." ]
defines = [ "V8_INSPECTOR_USE_STL" ]
cflags = []
if (is_win) {
cflags += [
@ -74,35 +70,32 @@ source_set("inspector_protocol") {
deps = [
":inspector_protocol_sources",
]
configs += [
":inspector_protocol_config"
]
include_dirs = [
"$target_gen_dir/..",
]
configs += [ ":inspector_protocol_config" ]
include_dirs = [ "$target_gen_dir/.." ]
sources = protocol_sources + [
"$protocol_path/Allocator.h",
"$protocol_path/Array.h",
"$protocol_path/BackendCallback.h",
"$protocol_path/CodeGenerator.py",
"$protocol_path/Collections.h",
"$protocol_path/DispatcherBase.cpp",
"$protocol_path/DispatcherBase.h",
"$protocol_path/ErrorSupport.cpp",
"$protocol_path/ErrorSupport.h",
"$protocol_path/FrontendChannel.h",
"$protocol_path/Maybe.h",
"$protocol_path/Object.cpp",
"$protocol_path/Object.h",
"$protocol_path/Parser.cpp",
"$protocol_path/Parser.h",
"$protocol_path/Platform.h",
"$protocol_path/PlatformSTL.h",
"$protocol_path/String16.h",
"$protocol_path/String16STL.cpp",
"$protocol_path/String16STL.h",
"$protocol_path/ValueConversions.h",
"$protocol_path/Values.cpp",
"$protocol_path/Values.h",
]
"$protocol_path/Allocator.h",
"$protocol_path/Array.h",
"$protocol_path/BackendCallback.h",
"$protocol_path/CodeGenerator.py",
"$protocol_path/Collections.h",
"$protocol_path/DispatcherBase.cpp",
"$protocol_path/DispatcherBase.h",
"$protocol_path/ErrorSupport.cpp",
"$protocol_path/ErrorSupport.h",
"$protocol_path/FrontendChannel.h",
"$protocol_path/Maybe.h",
"$protocol_path/Object.cpp",
"$protocol_path/Object.h",
"$protocol_path/Parser.cpp",
"$protocol_path/Parser.h",
"$protocol_path/Platform.h",
"$protocol_path/PlatformSTL.h",
"$protocol_path/String16.cpp",
"$protocol_path/String16.h",
"$protocol_path/String16STL.cpp",
"$protocol_path/String16STL.h",
"$protocol_path/ValueConversions.h",
"$protocol_path/Values.cpp",
"$protocol_path/Values.h",
]
}

3
src/inspector/inspector.gyp
View File

@ -50,7 +50,7 @@
'python',
'<(protocol_path)/CodeGenerator.py',
'--protocol', 'js_protocol.json',
'--string_type', 'String',
'--string_type', 'String16',
'--export_macro', 'PLATFORM_EXPORT',
'--output_dir', '<(SHARED_INTERMEDIATE_DIR)/inspector',
'--output_package', 'inspector',
@ -100,6 +100,7 @@
'<(protocol_path)/Parser.h',
'<(protocol_path)/Platform.h',
'<(protocol_path)/PlatformSTL.h',
'<(protocol_path)/String16.cpp',
'<(protocol_path)/String16.h',
'<(protocol_path)/String16STL.cpp',
'<(protocol_path)/String16STL.h',

10
test/BUILD.gn
View File

@ -17,7 +17,6 @@ group("gn_all") {
"cctest:cctest",
"cctest:generate-bytecode-expectations",
"unittests:unittests",
"inspector_protocol_parser_test:inspector_protocol_parser_test",
]
}
@ -44,7 +43,6 @@ group("default_tests") {
deps = [
":cctest_run",
":fuzzer_run",
":inspector_protocol_parser_test_run",
":intl_run",
":message_run",
":mjsunit_run",
@ -131,14 +129,6 @@ v8_isolate_run("fuzzer") {
isolate = "fuzzer/fuzzer.isolate"
}
v8_isolate_run("inspector_protocol_parser_test") {
deps = [
"inspector_protocol_parser_test:inspector_protocol_parser_test",
]
isolate = "inspector_protocol_parser_test/inspector_protocol_parser_test.isolate"
}
v8_isolate_run("intl") {
deps = [
"..:d8_run",

1
test/bot_default.gyp
View File

@ -12,7 +12,6 @@
'dependencies': [
'cctest/cctest.gyp:cctest_run',
'fuzzer/fuzzer.gyp:fuzzer_run',
'inspector_protocol_parser_test/inspector_protocol_parser_test.gyp:inspector_protocol_parser_test_run',
'intl/intl.gyp:intl_run',
'message/message.gyp:message_run',
'mjsunit/mjsunit.gyp:mjsunit_run',

1
test/bot_default.isolate
View File

@ -10,7 +10,6 @@
'includes': [
'cctest/cctest.isolate',
'fuzzer/fuzzer.isolate',
'inspector_protocol_parser_test/inspector_protocol_parser_test.isolate',
'intl/intl.isolate',
'message/message.isolate',
'mjsunit/mjsunit.isolate',

1
test/default.gyp
View File

@ -12,7 +12,6 @@
'dependencies': [
'cctest/cctest.gyp:cctest_run',
'fuzzer/fuzzer.gyp:fuzzer_run',
'inspector_protocol_parser_test/inspector_protocol_parser_test.gyp:inspector_protocol_parser_test_run',
'intl/intl.gyp:intl_run',
'message/message.gyp:message_run',
'mjsunit/mjsunit.gyp:mjsunit_run',

1
test/default.isolate
View File

@ -10,7 +10,6 @@
'includes': [
'cctest/cctest.isolate',
'fuzzer/fuzzer.isolate',
'inspector_protocol_parser_test/inspector_protocol_parser_test.isolate',
'intl/intl.isolate',
'message/message.isolate',
'mjsunit/mjsunit.isolate',

19
test/inspector_protocol_parser_test/BUILD.gn
View File

@ -3,21 +3,4 @@
# found in the LICENSE file.
import("../../gni/v8.gni")
v8_executable("inspector_protocol_parser_test") {
testonly = true
deps = [
"../../src/inspector:inspector_protocol",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
"//testing/gmock",
"//testing/gtest",
]
configs = [
"../../src/inspector:inspector_protocol_config"
]
sources = [
"//third_party/WebKit/Source/platform/inspector_protocol/ParserTest.cpp",
"RunTests.cpp",
]
}
# TODO: bring tests back once inspector_protocol is stable and moves out of blink.

39
test/inspector_protocol_parser_test/inspector_protocol_parser_test.gyp
View File

@ -2,48 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# TODO: bring tests back once inspector_protocol is stable and moves out of blink.
{ 'variables': {
'protocol_path': '../../third_party/WebKit/Source/platform/inspector_protocol',
},
'targets': [
{ 'target_name': 'inspector_protocol_parser_test',
'type': 'executable',
'dependencies': [
'../../src/inspector/inspector.gyp:inspector_protocol',
'../../testing/gmock.gyp:gmock',
'../../testing/gtest.gyp:gtest',
],
'include_dirs+': [
'../..',
'<(protocol_path)/../..',
],
'defines': [
'V8_INSPECTOR_USE_STL',
],
'sources': [
'<(protocol_path)/ParserTest.cpp',
'RunTests.cpp',
]
},
],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'inspector_protocol_parser_test_run',
'type': 'none',
'dependencies': [
'inspector_protocol_parser_test',
],
'includes': [
'../../gypfiles/features.gypi',
'../../gypfiles/isolate.gypi',
],
'sources': [
'inspector_protocol_parser_test.isolate',
],
},
],
}],
],
}

6
test/inspector_protocol_parser_test/inspector_protocol_parser_test.isolate
View File

@ -1,15 +1,13 @@
# Copyright 2016 the V8 project authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# TODO: bring tests back once inspector_protocol is stable and moves out of blink.
{
'variables': {
'files': [
'<(PRODUCT_DIR)/inspector_protocol_parser_test<(EXECUTABLE_SUFFIX)',
'./inspector_protocol_parser_test.status',
],
},
'includes': [
'../../src/base.isolate',
'../../tools/testrunner/testrunner.isolate',
],
}

2
tools/run-tests.py
View File

@ -71,7 +71,6 @@ TEST_MAP = {
"preparser",
"intl",
"unittests",
"inspector_protocol_parser_test",
],
# This needs to stay in sync with test/default.isolate.
"default": [
@ -82,7 +81,6 @@ TEST_MAP = {
"preparser",
"intl",
"unittests",
"inspector_protocol_parser_test",
],
# This needs to stay in sync with test/optimize_for_size.isolate.
"optimize_for_size": [