diff options
| author | brettw <brettw@chromium.org> | 2015-04-21 09:19:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-21 16:20:17 +0000 |
| commit | 690c9667354a606a9b899e5e2a282127c2057db8 (patch) | |
| tree | c68f43a45d83543adfeeb8cee41607d39f1f0d62 /net | |
| parent | ca726326c06b936d05106abde28bbc0f66b81e9d (diff) | |
| download | chromium_src-690c9667354a606a9b899e5e2a282127c2057db8.zip chromium_src-690c9667354a606a9b899e5e2a282127c2057db8.tar.gz chromium_src-690c9667354a606a9b899e5e2a282127c2057db8.tar.bz2 | |
Windows GN tests, webcrypto warnings
Enables many GN Windows tests.
The GN build wasn't disabling the size_t to int warning in webcrypto. I decided to fix the warnings rather than disable them. This code is a random mishmash of size_t, int, unsigned, and long (partially due to third party code). In this change, I tried to do something minimal and clear: some variables were changed to size_t, while some were converted to casts.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg
TBR=dpranke
Review URL: https://codereview.chromium.org/1091293003
Cr-Commit-Position: refs/heads/master@{#326046}
Diffstat (limited to 'net')
| -rw-r--r-- | net/BUILD.gn | 8 | ||||
| -rw-r--r-- | net/net.gyp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn index b425371..0f6cbbb 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1317,9 +1317,8 @@ executable("quic_server") { } # TODO(GYP) make this compile on Android, we need some native test deps done. -# TODO(GYP) Also doesn't work on Windows; dependency on boringssl is wrong. # TODO(GYP) Also doesn't work on Mac, need to figure out why not. -if (!is_android && !is_win && !is_mac) { +if (!is_android && !is_mac) { test("net_unittests") { sources = gypi_values.net_test_sources @@ -1328,11 +1327,11 @@ if (!is_android && !is_win && !is_mac) { defines = [] deps = [ + ":balsa", ":extras", ":http_server", ":net", ":net_quic_proto", - ":epoll_quic_tools", ":simple_quic_tools", ":test_support", "//base", @@ -1352,6 +1351,9 @@ if (!is_android && !is_win && !is_mac) { "//url", ] + if (is_desktop_linux) { + deps += [ ":epoll_quic_tools" ] + } if (is_linux) { sources += gypi_values.net_linux_test_sources deps += [ diff --git a/net/net.gyp b/net/net.gyp index 5e4ae19..9dacd43 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -103,6 +103,7 @@ ], }, { + # GN version: //net 'target_name': 'net', 'dependencies': [ '../base/base.gyp:base_i18n', @@ -120,6 +121,7 @@ 'includes': [ 'net_common.gypi' ], }, { + # GN version: //net:net_unittests 'target_name': 'net_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ @@ -741,7 +743,7 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, - { + { # GN version: //net:balsa 'target_name': 'balsa', 'type': 'static_library', 'dependencies': [ |