diff options
author | Jisi Liu <liujisi@google.com> | 2016-04-30 20:36:00 -0700 |
---|---|---|
committer | Jisi Liu <liujisi@google.com> | 2016-04-30 20:36:00 -0700 |
commit | 09f1757cf55236f14ab5cc23cf36ec802860744f (patch) | |
tree | 1b0d0c75d22a62302fc5bf4cad61b739b2029957 /cmake | |
parent | aed7b345fa7a6e54b76773a987dc5a31f88a0342 (diff) | |
parent | e0df23ac1483dcc68d2429c804aeba0508714892 (diff) | |
download | protobuf-09f1757cf55236f14ab5cc23cf36ec802860744f.tar.gz protobuf-09f1757cf55236f14ab5cc23cf36ec802860744f.tar.bz2 protobuf-09f1757cf55236f14ab5cc23cf36ec802860744f.zip |
Merge pull request #1467 from pherl/master
Merge Google internal changes
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/tests.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 941f33d8..76fdf8ef 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -52,6 +52,8 @@ set(tests_protos google/protobuf/unittest_preserve_unknown_enum.proto google/protobuf/unittest_preserve_unknown_enum2.proto google/protobuf/unittest_proto3_arena.proto + google/protobuf/unittest_proto3_arena_lite.proto + google/protobuf/unittest_proto3_lite.proto google/protobuf/unittest_well_known_types.proto google/protobuf/util/internal/testdata/anys.proto google/protobuf/util/internal/testdata/books.proto @@ -116,6 +118,7 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_unittest.cc + ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/metadata_test.cc ${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc ${protobuf_source_dir}/src/google/protobuf/compiler/importer_unittest.cc ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc @@ -140,7 +143,9 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/message_unittest.cc ${protobuf_source_dir}/src/google/protobuf/no_field_presence_test.cc ${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 ${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 |