diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
| commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
| tree | 16c54ef8d5409766c18ccae8fca685230680d620 /cmake/tests.cmake | |
| parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
| parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) | |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'cmake/tests.cmake')
| -rw-r--r-- | cmake/tests.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/tests.cmake b/cmake/tests.cmake index d4622c6b..6ab3071c 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -155,7 +155,8 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/preserve_unknown_enum_test.cc ${protobuf_source_dir}/src/google/protobuf/proto3_arena_lite_unittest.cc ${protobuf_source_dir}/src/google/protobuf/proto3_arena_unittest.cc - ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.cc +# TODO(b/74491957) Make this unittest work +# ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.cc ${protobuf_source_dir}/src/google/protobuf/reflection_ops_unittest.cc ${protobuf_source_dir}/src/google/protobuf/repeated_field_reflection_unittest.cc ${protobuf_source_dir}/src/google/protobuf/repeated_field_unittest.cc @@ -163,7 +164,6 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/stubs/common_unittest.cc ${protobuf_source_dir}/src/google/protobuf/stubs/int128_unittest.cc ${protobuf_source_dir}/src/google/protobuf/stubs/io_win32_unittest.cc - ${protobuf_source_dir}/src/google/protobuf/stubs/once_unittest.cc ${protobuf_source_dir}/src/google/protobuf/stubs/status_test.cc ${protobuf_source_dir}/src/google/protobuf/stubs/statusor_test.cc ${protobuf_source_dir}/src/google/protobuf/stubs/stringpiece_unittest.cc @@ -172,7 +172,6 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/stubs/strutil_unittest.cc ${protobuf_source_dir}/src/google/protobuf/stubs/template_util_unittest.cc ${protobuf_source_dir}/src/google/protobuf/stubs/time_test.cc - ${protobuf_source_dir}/src/google/protobuf/stubs/type_traits_unittest.cc ${protobuf_source_dir}/src/google/protobuf/text_format_unittest.cc ${protobuf_source_dir}/src/google/protobuf/unknown_field_set_unittest.cc ${protobuf_source_dir}/src/google/protobuf/util/delimited_message_util_test.cc |