diff options
| author | yzshen <yzshen@chromium.org> | 2016-03-18 17:34:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-19 00:37:02 +0000 |
| commit | aef38024a1d6d99deb565a89cd7dd8b3bc21f971 (patch) | |
| tree | 535b7efd2b728b6fd58f14f5279ef262f6612b34 /mojo/mojo_edk_tests.gyp | |
| parent | 47a37f2d0ea2fea26d57f02dd822fe4cc44eba7a (diff) | |
| download | chromium_src-aef38024a1d6d99deb565a89cd7dd8b3bc21f971.zip chromium_src-aef38024a1d6d99deb565a89cd7dd8b3bc21f971.tar.gz chromium_src-aef38024a1d6d99deb565a89cd7dd8b3bc21f971.tar.bz2 | |
Mojo C++ bindings: assume that all imported mojoms have the same variant as current mojom.
This CL also disable struct_traits_unittest because variant+typemap is not supported currently.
BUG=596202,596162
Review URL: https://codereview.chromium.org/1816703002
Cr-Commit-Position: refs/heads/master@{#382143}
Diffstat (limited to 'mojo/mojo_edk_tests.gyp')
| -rw-r--r-- | mojo/mojo_edk_tests.gyp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp index e6c82c9..e7a396f 100644 --- a/mojo/mojo_edk_tests.gyp +++ b/mojo/mojo_edk_tests.gyp @@ -83,8 +83,9 @@ 'public/cpp/bindings/tests/pickled_struct_blink.h', 'public/cpp/bindings/tests/pickled_struct_chromium.cc', 'public/cpp/bindings/tests/pickled_struct_chromium.h', - 'public/cpp/bindings/tests/rect_blink.h', - 'public/cpp/bindings/tests/rect_chromium.h', + # TODO: crbug.com/596202 + # 'public/cpp/bindings/tests/rect_blink.h', + # 'public/cpp/bindings/tests/rect_chromium.h', 'public/cpp/bindings/tests/request_response_unittest.cc', 'public/cpp/bindings/tests/router_test_util.cc', 'public/cpp/bindings/tests/router_test_util.h', @@ -93,7 +94,7 @@ 'public/cpp/bindings/tests/serialization_warning_unittest.cc', 'public/cpp/bindings/tests/stl_converters_unittest.cc', 'public/cpp/bindings/tests/string_unittest.cc', - 'public/cpp/bindings/tests/struct_traits_unittest.cc', + # 'public/cpp/bindings/tests/struct_traits_unittest.cc', 'public/cpp/bindings/tests/struct_unittest.cc', 'public/cpp/bindings/tests/struct_with_traits_impl.cc', 'public/cpp/bindings/tests/struct_with_traits_impl.h', |