diff options
| author | yosin <yosin@chromium.org> | 2015-08-22 05:05:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-22 12:06:31 +0000 |
| commit | 1dc9aa14380b7c6c77d80354b86f55ede462766e (patch) | |
| tree | 882e6d1e47ae4aeaf2c7d93aa2f276d2e955a21c /components/url_matcher | |
| parent | 027a930a4f456a173b5c01d8537185187698caeb (diff) | |
| download | chromium_src-1dc9aa14380b7c6c77d80354b86f55ede462766e.zip chromium_src-1dc9aa14380b7c6c77d80354b86f55ede462766e.tar.gz chromium_src-1dc9aa14380b7c6c77d80354b86f55ede462766e.tar.bz2 | |
Revert of Add more components_unittests to GN build (patchset #5 id:80001 of https://codereview.chromium.org/1303703004/ )
Reason for revert:
Compilation error in storage_monitor_win_unittest.cc.
GYP build may not compile this file.
FAILED: ninja -t msvc -e environment.x64 -- E:\b\build\goma/gomacc.exe "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64/cl.exe" /nologo /showIncludes /FC @obj/components/storage_monitor/unit_tests/storage_monitor_win_unittest.obj.rsp /c ../../components/storage_monitor/storage_monitor_win_unittest.cc /Foobj/components/storage_monitor/unit_tests/storage_monitor_win_unittest.obj /Fdobj/components/storage_monitor/unit_tests_cc.pdb
e:\b\build\slave\win_x64_gn__dbg_\build\src\components\storage_monitor\storage_monitor_win_unittest.cc(218) : error C2220: warning treated as error - no 'object' file generated
e:\b\build\slave\win_x64_gn__dbg_\build\src\components\storage_monitor\storage_monitor_win_unittest.cc(218) : warning C4267: '=' : conversion from 'size_t' to 'DWORD', possible loss of data
e:\b\build\slave\win_x64_gn__dbg_\build\src\components\storage_monitor\storage_monitor_win_unittest.cc(298) : warning C4267: 'initializing' : conversion from 'size_t' to 'int', possible loss of data
ninja: build stopped: subcommand failed.
Original issue's description:
> Add more components_unittests to GN build
>
> This adds tests for: url matcher, precache, sync driver, serialization, proxy config, leveldb proto, error page, storage monitor, search provider logos, translate, json schema, guest view, dom distiller, network hints.
>
> CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel
>
> Committed: https://crrev.com/c76a816074e6504b0b4b3420529928057d11b50b
> Cr-Commit-Position: refs/heads/master@{#344974}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1313463002
Cr-Commit-Position: refs/heads/master@{#344976}
Diffstat (limited to 'components/url_matcher')
| -rw-r--r-- | components/url_matcher/BUILD.gn | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/components/url_matcher/BUILD.gn b/components/url_matcher/BUILD.gn index 9ba616f..7df189b 100644 --- a/components/url_matcher/BUILD.gn +++ b/components/url_matcher/BUILD.gn @@ -23,7 +23,7 @@ component("url_matcher") { defines = [ "URL_MATCHER_IMPLEMENTATION" ] - public_deps = [ + deps = [ "//base", "//base/third_party/dynamic_annotations", "//third_party/re2", @@ -32,18 +32,3 @@ component("url_matcher") { configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } - -source_set("unit_tests") { - testonly = true - sources = [ - "regex_set_matcher_unittest.cc", - "string_pattern_unittest.cc", - "substring_set_matcher_unittest.cc", - "url_matcher_factory_unittest.cc", - "url_matcher_unittest.cc", - ] - deps = [ - ":url_matcher", - "//testing/gtest", - ] -} |