From 1dc9aa14380b7c6c77d80354b86f55ede462766e Mon Sep 17 00:00:00 2001 From: yosin Date: Sat, 22 Aug 2015 05:05:45 -0700 Subject: 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} --- components/storage_monitor/BUILD.gn | 38 +++++-------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) (limited to 'components/storage_monitor') diff --git a/components/storage_monitor/BUILD.gn b/components/storage_monitor/BUILD.gn index bb7034b..48b34d0 100644 --- a/components/storage_monitor/BUILD.gn +++ b/components/storage_monitor/BUILD.gn @@ -5,7 +5,7 @@ import("//build/config/features.gni") # GYP version: components/storage_monitor.gypi:storage_monitor -source_set("storage_monitor") { +static_library("storage_monitor") { sources = [ "image_capture_device.h", "image_capture_device.mm", @@ -85,7 +85,7 @@ source_set("storage_monitor") { } # GYP version: components/storage_monitor.gypi:storage_monitor_test_support -source_set("test_support") { +static_library("test_support") { sources = [ "mock_removable_storage_observer.cc", "mock_removable_storage_observer.h", @@ -101,44 +101,16 @@ source_set("test_support") { "test_volume_mount_watcher_win.h", ] - public_deps = [ - ":storage_monitor", + deps = [ "//base", + ":storage_monitor", ] if (is_linux) { - deps = [ + deps += [ "//device/media_transfer_protocol", "//device/media_transfer_protocol:mtp_file_entry_proto", "//device/media_transfer_protocol:mtp_storage_info_proto", ] } } - -source_set("unit_tests") { - testonly = true - sources = [ - "image_capture_device_manager_unittest.mm", - "media_storage_util_unittest.cc", - "media_transfer_protocol_device_observer_linux_unittest.cc", - "storage_info_unittest.cc", - "storage_monitor_mac_unittest.mm", - "storage_monitor_unittest.cc", - "storage_monitor_win_unittest.cc", - ] - deps = [ - ":test_support", - "//testing/gtest", - ] - - if (is_linux && !is_chromeos) { - sources += [ "storage_monitor_linux_unittest.cc" ] - } - if (is_chromeos) { - sources += [ "storage_monitor_chromeos_unittest.cc" ] - deps += [ - "//chromeos:test_support", - "//testing/gmock", - ] - } -} -- cgit v1.1