Skip to content

V
V8
Commit ab53a8b9 authored by dgozman's avatar dgozman Committed by Commit bot
Browse files
Options

[inspector] Remove inspector_protocol_parser_test target. 

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}
parent dc384372
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 115 deletions
gypfiles/all.gyp
View file @ ab53a8b9
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
'../samples/samples.gyp:*', '../samples/samples.gyp:*',
'../test/cctest/cctest.gyp:*', '../test/cctest/cctest.gyp:*',
'../test/fuzzer/fuzzer.gyp:*', '../test/fuzzer/fuzzer.gyp:*',
'../test/inspector_protocol_parser_test/inspector_protocol_parser_test.gyp:*',
'../test/unittests/unittests.gyp:*', '../test/unittests/unittests.gyp:*',
], ],
}], }],
......
src/inspector/BUILD.gn
View file @ ab53a8b9
...@@ -36,7 +36,7 @@ action("inspector_protocol_sources") { ...@@ -36,7 +36,7 @@ action("inspector_protocol_sources") {
"--protocol", "--protocol",
rebase_path("js_protocol.json", root_build_dir), rebase_path("js_protocol.json", root_build_dir),
"--string_type", "--string_type",
"String", "String16",
"--export_macro", "--export_macro",
"PLATFORM_EXPORT", "PLATFORM_EXPORT",
"--output_dir", "--output_dir",
...@@ -51,12 +51,8 @@ action("inspector_protocol_sources") { ...@@ -51,12 +51,8 @@ action("inspector_protocol_sources") {
} }
config("inspector_protocol_config") { config("inspector_protocol_config") {
include_dirs = [ include_dirs = [ "$protocol_path/../.." ]
"$protocol_path/../..", defines = [ "V8_INSPECTOR_USE_STL" ]
]
defines = [
"V8_INSPECTOR_USE_STL"
]
cflags = [] cflags = []
if (is_win) { if (is_win) {
cflags += [ cflags += [
...@@ -74,35 +70,32 @@ source_set("inspector_protocol") { ...@@ -74,35 +70,32 @@ source_set("inspector_protocol") {
deps = [ deps = [
":inspector_protocol_sources", ":inspector_protocol_sources",
] ]
configs += [ configs += [ ":inspector_protocol_config" ]
":inspector_protocol_config" include_dirs = [ "$target_gen_dir/.." ]
]
include_dirs = [
"$target_gen_dir/..",
]
sources = protocol_sources + [ sources = protocol_sources + [
"$protocol_path/Allocator.h", "$protocol_path/Allocator.h",
"$protocol_path/Array.h", "$protocol_path/Array.h",
"$protocol_path/BackendCallback.h", "$protocol_path/BackendCallback.h",
"$protocol_path/CodeGenerator.py", "$protocol_path/CodeGenerator.py",
"$protocol_path/Collections.h", "$protocol_path/Collections.h",
"$protocol_path/DispatcherBase.cpp", "$protocol_path/DispatcherBase.cpp",
"$protocol_path/DispatcherBase.h", "$protocol_path/DispatcherBase.h",
"$protocol_path/ErrorSupport.cpp", "$protocol_path/ErrorSupport.cpp",
"$protocol_path/ErrorSupport.h", "$protocol_path/ErrorSupport.h",
"$protocol_path/FrontendChannel.h", "$protocol_path/FrontendChannel.h",
"$protocol_path/Maybe.h", "$protocol_path/Maybe.h",
"$protocol_path/Object.cpp", "$protocol_path/Object.cpp",
"$protocol_path/Object.h", "$protocol_path/Object.h",
"$protocol_path/Parser.cpp", "$protocol_path/Parser.cpp",
"$protocol_path/Parser.h", "$protocol_path/Parser.h",
"$protocol_path/Platform.h", "$protocol_path/Platform.h",
"$protocol_path/PlatformSTL.h", "$protocol_path/PlatformSTL.h",
"$protocol_path/String16.h", "$protocol_path/String16.cpp",
"$protocol_path/String16STL.cpp", "$protocol_path/String16.h",
"$protocol_path/String16STL.h", "$protocol_path/String16STL.cpp",
"$protocol_path/ValueConversions.h", "$protocol_path/String16STL.h",
"$protocol_path/Values.cpp", "$protocol_path/ValueConversions.h",
"$protocol_path/Values.h", "$protocol_path/Values.cpp",
] "$protocol_path/Values.h",
]
} }
src/inspector/inspector.gyp
View file @ ab53a8b9
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
'python', 'python',
'<(protocol_path)/CodeGenerator.py', '<(protocol_path)/CodeGenerator.py',
'--protocol', 'js_protocol.json', '--protocol', 'js_protocol.json',
'--string_type', 'String', '--string_type', 'String16',
'--export_macro', 'PLATFORM_EXPORT', '--export_macro', 'PLATFORM_EXPORT',
'--output_dir', '<(SHARED_INTERMEDIATE_DIR)/inspector', '--output_dir', '<(SHARED_INTERMEDIATE_DIR)/inspector',
'--output_package', 'inspector', '--output_package', 'inspector',
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
'<(protocol_path)/Parser.h', '<(protocol_path)/Parser.h',
'<(protocol_path)/Platform.h', '<(protocol_path)/Platform.h',
'<(protocol_path)/PlatformSTL.h', '<(protocol_path)/PlatformSTL.h',
'<(protocol_path)/String16.cpp',
'<(protocol_path)/String16.h', '<(protocol_path)/String16.h',
'<(protocol_path)/String16STL.cpp', '<(protocol_path)/String16STL.cpp',
'<(protocol_path)/String16STL.h', '<(protocol_path)/String16STL.h',
......
test/BUILD.gn
View file @ ab53a8b9
...@@ -17,7 +17,6 @@ group("gn_all") { ...@@ -17,7 +17,6 @@ group("gn_all") {
"cctest:cctest", "cctest:cctest",
"cctest:generate-bytecode-expectations", "cctest:generate-bytecode-expectations",
"unittests:unittests", "unittests:unittests",
"inspector_protocol_parser_test:inspector_protocol_parser_test",
] ]
} }
...@@ -44,7 +43,6 @@ group("default_tests") { ...@@ -44,7 +43,6 @@ group("default_tests") {
deps = [ deps = [
":cctest_run", ":cctest_run",
":fuzzer_run", ":fuzzer_run",
":inspector_protocol_parser_test_run",
":intl_run", ":intl_run",
":message_run", ":message_run",
":mjsunit_run", ":mjsunit_run",
...@@ -131,14 +129,6 @@ v8_isolate_run("fuzzer") { ...@@ -131,14 +129,6 @@ v8_isolate_run("fuzzer") {
isolate = "fuzzer/fuzzer.isolate" 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") { v8_isolate_run("intl") {
deps = [ deps = [
"..:d8_run", "..:d8_run",
......
test/bot_default.gyp
View file @ ab53a8b9
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
'dependencies': [ 'dependencies': [
'cctest/cctest.gyp:cctest_run', 'cctest/cctest.gyp:cctest_run',
'fuzzer/fuzzer.gyp:fuzzer_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', 'intl/intl.gyp:intl_run',
'message/message.gyp:message_run', 'message/message.gyp:message_run',
'mjsunit/mjsunit.gyp:mjsunit_run', 'mjsunit/mjsunit.gyp:mjsunit_run',
......
test/bot_default.isolate
View file @ ab53a8b9
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
'includes': [ 'includes': [
'cctest/cctest.isolate', 'cctest/cctest.isolate',
'fuzzer/fuzzer.isolate', 'fuzzer/fuzzer.isolate',
'inspector_protocol_parser_test/inspector_protocol_parser_test.isolate',
'intl/intl.isolate', 'intl/intl.isolate',
'message/message.isolate', 'message/message.isolate',
'mjsunit/mjsunit.isolate', 'mjsunit/mjsunit.isolate',
......
test/default.gyp
View file @ ab53a8b9
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
'dependencies': [ 'dependencies': [
'cctest/cctest.gyp:cctest_run', 'cctest/cctest.gyp:cctest_run',
'fuzzer/fuzzer.gyp:fuzzer_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', 'intl/intl.gyp:intl_run',
'message/message.gyp:message_run', 'message/message.gyp:message_run',
'mjsunit/mjsunit.gyp:mjsunit_run', 'mjsunit/mjsunit.gyp:mjsunit_run',
......
test/default.isolate
View file @ ab53a8b9
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
'includes': [ 'includes': [
'cctest/cctest.isolate', 'cctest/cctest.isolate',
'fuzzer/fuzzer.isolate', 'fuzzer/fuzzer.isolate',
'inspector_protocol_parser_test/inspector_protocol_parser_test.isolate',
'intl/intl.isolate', 'intl/intl.isolate',
'message/message.isolate', 'message/message.isolate',
'mjsunit/mjsunit.isolate', 'mjsunit/mjsunit.isolate',
......
test/inspector_protocol_parser_test/BUILD.gn
View file @ ab53a8b9
...@@ -3,21 +3,4 @@ ...@@ -3,21 +3,4 @@
# found in the LICENSE file. # found in the LICENSE file.
import("../../gni/v8.gni") import("../../gni/v8.gni")
# TODO: bring tests back once inspector_protocol is stable and moves out of blink.
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",
]
}
test/inspector_protocol_parser_test/inspector_protocol_parser_test.gyp
View file @ ab53a8b9
...@@ -2,48 +2,11 @@ ...@@ -2,48 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# TODO: bring tests back once inspector_protocol is stable and moves out of blink.
{ 'variables': { { 'variables': {
'protocol_path': '../../third_party/WebKit/Source/platform/inspector_protocol',
}, },
'targets': [ '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': [ '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',
],
},
],
}],
], ],
} }
test/inspector_protocol_parser_test/inspector_protocol_parser_test.isolate
View file @ ab53a8b9
# Copyright 2016 the V8 project authors. All rights reserved. # Copyright 2016 the V8 project authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# TODO: bring tests back once inspector_protocol is stable and moves out of blink.
{ {
'variables': { 'variables': {
'files': [ 'files': [
'<(PRODUCT_DIR)/inspector_protocol_parser_test<(EXECUTABLE_SUFFIX)',
'./inspector_protocol_parser_test.status',
], ],
}, },
'includes': [ 'includes': [
'../../src/base.isolate',
'../../tools/testrunner/testrunner.isolate',
], ],
} }
\ No newline at end of file
tools/run-tests.py
View file @ ab53a8b9
...@@ -71,7 +71,6 @@ TEST_MAP = { ...@@ -71,7 +71,6 @@ TEST_MAP = {
"preparser", "preparser",
"intl", "intl",
"unittests", "unittests",
"inspector_protocol_parser_test",
], ],
# This needs to stay in sync with test/default.isolate. # This needs to stay in sync with test/default.isolate.
"default": [ "default": [
...@@ -82,7 +81,6 @@ TEST_MAP = { ...@@ -82,7 +81,6 @@ TEST_MAP = {
"preparser", "preparser",
"intl", "intl",
"unittests", "unittests",
"inspector_protocol_parser_test",
], ],
# This needs to stay in sync with test/optimize_for_size.isolate. # This needs to stay in sync with test/optimize_for_size.isolate.
"optimize_for_size": [ "optimize_for_size": [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment