Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
Protocol Buffers - Google's data interchange format (grpc依赖) https://developers.google.com/protocol-buffers/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
17395 Commits
197 Branches
346 Tags
251 MiB
Tag: Branch: Tree: 7ab65a08ac
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7ab65a08ac'
${ noResults }
protobuf/cmake/conformance.cmake

127 lines
5.8 KiB
Raw Normal View History Unescape

Enable the selection of system provided jsoncpp (#12577) Allows the use of an external `jsoncpp` library to be used. Replicates the model used by `abseil-cpp` as a "package" or "module" to the `protobuf_JSONCPP_PROVIDER` option. Resolves: #11827 Closes #12577 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12577 from omenos:omenos/cmake-jsoncpp 073edd69b4d3c57a37c00f1ba992e6cbd1dad949 PiperOrigin-RevId: 528492610
2 years ago
if (protobuf_JSONCPP_PROVIDER STREQUAL "module")
if (NOT EXISTS "${protobuf_SOURCE_DIR}/third_party/jsoncpp/CMakeLists.txt")
message(FATAL_ERROR
"Cannot find third_party/jsoncpp directory that's needed to "
"build conformance tests. If you use git, make sure you have cloned "
"submodules:\n"
" git submodule update --init --recursive\n"
"If instead you want to skip them, run cmake with:\n"
" cmake -Dprotobuf_BUILD_CONFORMANCE=OFF\n")
endif()
elseif(protobuf_JSONCPP_PROVIDER STREQUAL "package")
find_package(jsoncpp REQUIRED)
Make jsoncpp a formal dependency (#10739) * Adding jsoncpp submodule * Adding bazel dependency * Hook up jsoncpp in Bazel builds * Hook up jsoncpp dependency in CMake * Fix conformance binary path * Move jsoncpp import to the end of the file to avoid confusing add_test
2 years ago
endif()
Write generated source files to the build tree, not the source tree. (#14455) My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others): ``` [ 30%] Built target statusor [ 34%] Built target libprotobuf-lite [ 45%] Built target libprotobuf Consolidate compiler generated dependencies of target libprotoc [ 62%] Built target libprotoc Consolidate compiler generated dependencies of target protoc [ 62%] Built target protoc Consolidate compiler generated dependencies of target scoped_mock_log [ 62%] Built target scoped_mock_log [ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1 make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2 make: *** [Makefile:146: all] Error 2 ``` (`/home/src` is a read-only mount) Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources. (Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.) Closes #14455 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587 PiperOrigin-RevId: 607031010
10 months ago
file(MAKE_DIRECTORY ${protobuf_BINARY_DIR}/conformance)
Auxillary -> Auxiliary
5 years ago
add_custom_command(
Improve CMake installation tests (#10615) * Using glob to remove headers instead of cyclic file_lists * Simplify CMake config and include missing files * Don't remove generated proto headers * Fix broken CMake proto dependencies instead of opting out pb.h files. * Fixing cyclic dependency
2 years ago
OUTPUT
Write generated source files to the build tree, not the source tree. (#14455) My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others): ``` [ 30%] Built target statusor [ 34%] Built target libprotobuf-lite [ 45%] Built target libprotobuf Consolidate compiler generated dependencies of target libprotoc [ 62%] Built target libprotoc Consolidate compiler generated dependencies of target protoc [ 62%] Built target protoc Consolidate compiler generated dependencies of target scoped_mock_log [ 62%] Built target scoped_mock_log [ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1 make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2 make: *** [Makefile:146: all] Error 2 ``` (`/home/src` is a read-only mount) Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources. (Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.) Closes #14455 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587 PiperOrigin-RevId: 607031010
10 months ago
${protobuf_BINARY_DIR}/conformance/conformance.pb.h
${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
cmake: Replace protobuf_source_dir variable with protobuf_SOURCE_DIR variable (#9596) protobuf_source_dir variable is no longer needed and has the same value as protobuf_SOURCE_DIR variable, which is instance of CMake-standard <PROJECT-NAME>_SOURCE_DIR variable: https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
3 years ago
DEPENDS ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/conformance/conformance.proto
COMMAND ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/conformance/conformance.proto
--proto_path=${protobuf_SOURCE_DIR}/conformance
Make CMake always build test protos into a static library When building with `-Dprotobuf_BUILD_SHARED_LIBS=ON`, we currently put all test protos into their own shared library. PR #15887 seems to be pushing us over a limit on the number of exported symbols so that this library no longer links successfully, though. This change fixes that problem by always building the test protos into a static library. This should be fine since it's purely for testing and not meant to be installed. The only things that depend on it are executables, so we don't need to worry about ODR violations. PiperOrigin-RevId: 617929396
8 months ago
--cpp_out=${protobuf_BINARY_DIR}/conformance
Auxillary -> Auxiliary
5 years ago
)
Write generated source files to the build tree, not the source tree. (#14455) My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others): ``` [ 30%] Built target statusor [ 34%] Built target libprotobuf-lite [ 45%] Built target libprotobuf Consolidate compiler generated dependencies of target libprotoc [ 62%] Built target libprotoc Consolidate compiler generated dependencies of target protoc [ 62%] Built target protoc Consolidate compiler generated dependencies of target scoped_mock_log [ 62%] Built target scoped_mock_log [ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1 make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2 make: *** [Makefile:146: all] Error 2 ``` (`/home/src` is a read-only mount) Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources. (Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.) Closes #14455 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587 PiperOrigin-RevId: 607031010
10 months ago
file(MAKE_DIRECTORY ${protobuf_BINARY_DIR}/src)
Auxillary -> Auxiliary
5 years ago
add_custom_command(
Improve CMake installation tests (#10615) * Using glob to remove headers instead of cyclic file_lists * Simplify CMake config and include missing files * Don't remove generated proto headers * Fix broken CMake proto dependencies instead of opting out pb.h files. * Fixing cyclic dependency
2 years ago
OUTPUT
Write generated source files to the build tree, not the source tree. (#14455) My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others): ``` [ 30%] Built target statusor [ 34%] Built target libprotobuf-lite [ 45%] Built target libprotobuf Consolidate compiler generated dependencies of target libprotoc [ 62%] Built target libprotoc Consolidate compiler generated dependencies of target protoc [ 62%] Built target protoc Consolidate compiler generated dependencies of target scoped_mock_log [ 62%] Built target scoped_mock_log [ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1 make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2 make: *** [Makefile:146: all] Error 2 ``` (`/home/src` is a read-only mount) Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources. (Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.) Closes #14455 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587 PiperOrigin-RevId: 607031010
10 months ago
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto3_editions.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto3_editions.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto2_editions.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto2_editions.pb.cc
Enable conformance tests over editions protos We transformed the proto2/proto3 protos to editions, and then run the same set of tests over both. This will verify that migrating to editions preserves the same proto2/proto3 behavior. These will not be enabled by default, and require a flag `--maximum_edition=2023`. Future changes will: - add more targeted editions-specific tests - clean up our conformance test framework to allow for more targeted tests - add wildcards to failure lists in limited cases to reduce noise - add feature resolution conformance tests PiperOrigin-RevId: 574570607
1 year ago
DEPENDS ${protobuf_PROTOC_EXE}
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.proto
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.proto
${protobuf_SOURCE_DIR}/src/google/protobuf/editions/golden/test_messages_proto3_editions.proto
${protobuf_SOURCE_DIR}/src/google/protobuf/editions/golden/test_messages_proto2_editions.proto
COMMAND ${protobuf_PROTOC_EXE}
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.proto
${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.proto
${protobuf_SOURCE_DIR}/src/google/protobuf/editions/golden/test_messages_proto3_editions.proto
${protobuf_SOURCE_DIR}/src/google/protobuf/editions/golden/test_messages_proto2_editions.proto
--proto_path=${protobuf_SOURCE_DIR}/src
Make CMake always build test protos into a static library When building with `-Dprotobuf_BUILD_SHARED_LIBS=ON`, we currently put all test protos into their own shared library. PR #15887 seems to be pushing us over a limit on the number of exported symbols so that this library no longer links successfully, though. This change fixes that problem by always building the test protos into a static library. This should be fine since it's purely for testing and not meant to be installed. The only things that depend on it are executables, so we don't need to worry about ODR violations. PiperOrigin-RevId: 617929396
8 months ago
--cpp_out=${protobuf_BINARY_DIR}/src
Auxillary -> Auxiliary
5 years ago
)
Make CMake always build test protos into a static library When building with `-Dprotobuf_BUILD_SHARED_LIBS=ON`, we currently put all test protos into their own shared library. PR #15887 seems to be pushing us over a limit on the number of exported symbols so that this library no longer links successfully, though. This change fixes that problem by always building the test protos into a static library. This should be fine since it's purely for testing and not meant to be installed. The only things that depend on it are executables, so we don't need to worry about ODR violations. PiperOrigin-RevId: 617929396
8 months ago
add_library(libconformance_common STATIC
Write generated source files to the build tree, not the source tree. (#14455) My org, as part of its reproducible-build hygiene, builds projects with the source trees in read-only mode. I approached the protobuf build in the same way, but encountered this error (among others): ``` [ 30%] Built target statusor [ 34%] Built target libprotobuf-lite [ 45%] Built target libprotobuf Consolidate compiler generated dependencies of target libprotoc [ 62%] Built target libprotoc Consolidate compiler generated dependencies of target protoc [ 62%] Built target protoc Consolidate compiler generated dependencies of target scoped_mock_log [ 62%] Built target scoped_mock_log [ 62%] Generating /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h, /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.cc: Read-only file system make[2]: *** [CMakeFiles/libtest_common.dir/build.make:387: /home/src/protobuf/src/google/protobuf/util/message_differencer_unittest_proto3.pb.h] Error 1 make[1]: *** [CMakeFiles/Makefile2:1194: CMakeFiles/libtest_common.dir/all] Error 2 make: *** [Makefile:146: all] Error 2 ``` (`/home/src` is a read-only mount) Generated source files are effectively build artifacts, and should be written to the build tree, not the source tree. This PR accordingly enables a successful build and test run (lite, full, and conformance) with read-only sources. (Beyond this, I would add that CMake usually does not need source file paths to be qualified with `CMAKE_SOURCE_DIR` or `CMAKE_BINARY_DIR`; in most cases it knows to look in both locations, favoring the latter if a file is in both. The CMake code could be simplified by relying on this behavior.) Closes #14455 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14455 from iskunk:feature/ro-source da7510c24a3c77ab09306647ef864a886b690587 PiperOrigin-RevId: 607031010
10 months ago
${protobuf_BINARY_DIR}/conformance/conformance.pb.h
${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto3_editions.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto3_editions.pb.cc
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto2_editions.pb.h
${protobuf_BINARY_DIR}/src/google/protobuf/editions/golden/test_messages_proto2_editions.pb.cc
Build test protos into a common shared library in cmake. This will reduce the number of times our test protos are built, and may fix the flakes we're seeing in aarch64. At the very least, it should reduce them by a factor of 3 and marginally speed up our builds. PiperOrigin-RevId: 568963559
1 year ago
)
target_link_libraries(libconformance_common
${protobuf_LIB_PROTOBUF}
${protobuf_ABSL_USED_TARGETS}
)
Auxillary -> Auxiliary
5 years ago
add_executable(conformance_test_runner
cmake: Replace protobuf_source_dir variable with protobuf_SOURCE_DIR variable (#9596) protobuf_source_dir variable is no longer needed and has the same value as protobuf_SOURCE_DIR variable, which is instance of CMake-standard <PROJECT-NAME>_SOURCE_DIR variable: https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
3 years ago
${protobuf_SOURCE_DIR}/conformance/binary_json_conformance_suite.cc
${protobuf_SOURCE_DIR}/conformance/binary_json_conformance_suite.h
${protobuf_SOURCE_DIR}/conformance/conformance_test.cc
${protobuf_SOURCE_DIR}/conformance/conformance_test_runner.cc
Implement cmake linux tests (#10306) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Deleting extract_includes.bat now that it's been replaced with the generated file_lists.cmake * Removing unnecessary endif conditions
2 years ago
${protobuf_SOURCE_DIR}/conformance/conformance_test_main.cc
${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.cc
${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.h
Auxillary -> Auxiliary
5 years ago
)
add_executable(conformance_cpp
cmake: Replace protobuf_source_dir variable with protobuf_SOURCE_DIR variable (#9596) protobuf_source_dir variable is no longer needed and has the same value as protobuf_SOURCE_DIR variable, which is instance of CMake-standard <PROJECT-NAME>_SOURCE_DIR variable: https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
3 years ago
${protobuf_SOURCE_DIR}/conformance/conformance_cpp.cc
Auxillary -> Auxiliary
5 years ago
)
target_include_directories(
conformance_test_runner
Remove all autotools usage (#10132) * Bazelfying conformance tests Adding infrastructure to "Bazelify" languages other than Java and C++ * Delete benchmarks for languages supported by other repositories * Bazelfying benchmark tests * Bazelfying python Use upb's system python rule instead of branching tensorflow * Bazelfying Ruby * Bazelfying C# * Bazelfying Objective-c * Bazelfying Kokoro mac builds * Bazelfying Kokoro linux builds * Deleting all deprecated files from autotools cleanup This boils down to Makefile.am and tests.sh and all of their remaining references * Cleanup after PR reorganizing - Enable 32 bit tests - Move conformance tests back - Use select statements to select alternate runtimes - Add internal prefixes to proto library macros * Updating READMEs to use bazel instead of autotools. * Bazelfying Kokoro release builds * First round of review fixes * Second round of review fixes * Third round of review fixes * Filtering out conformance tests from Bazel on Windows (b/241484899) * Add version metadata that was previously scraped from configure.ac * fixing typo from previous fix * Adding ruby version tests * Bumping pinned upb version, and adding tests to python CI
2 years ago
PUBLIC ${protobuf_SOURCE_DIR} ${protobuf_SOURCE_DIR}/conformance)
Auxillary -> Auxiliary
5 years ago
target_include_directories(
conformance_cpp
Remove all autotools usage (#10132) * Bazelfying conformance tests Adding infrastructure to "Bazelify" languages other than Java and C++ * Delete benchmarks for languages supported by other repositories * Bazelfying benchmark tests * Bazelfying python Use upb's system python rule instead of branching tensorflow * Bazelfying Ruby * Bazelfying C# * Bazelfying Objective-c * Bazelfying Kokoro mac builds * Bazelfying Kokoro linux builds * Deleting all deprecated files from autotools cleanup This boils down to Makefile.am and tests.sh and all of their remaining references * Cleanup after PR reorganizing - Enable 32 bit tests - Move conformance tests back - Use select statements to select alternate runtimes - Add internal prefixes to proto library macros * Updating READMEs to use bazel instead of autotools. * Bazelfying Kokoro release builds * First round of review fixes * Second round of review fixes * Third round of review fixes * Filtering out conformance tests from Bazel on Windows (b/241484899) * Add version metadata that was previously scraped from configure.ac * fixing typo from previous fix * Adding ruby version tests * Bumping pinned upb version, and adding tests to python CI
2 years ago
PUBLIC ${protobuf_SOURCE_DIR})
Auxillary -> Auxiliary
5 years ago
Integrate from Piper for C++, Java, and Python (#10429) * Fixing typos * Revert new files that were deleted by sync script * Fix CMake breakages * bump upb version * Sync from Piper @468772608 PROTOBUF_SYNC_PIPER * Adding abseil to include path for python C++ extension * Adding abseil linkage for python C++ extension * Fixing linkage order
2 years ago
target_include_directories(conformance_test_runner PRIVATE ${ABSL_ROOT_DIR})
Update CMake configuration to add a dependency on Abseil (#10401) * Rolling https://github.com/protocolbuffers/protobuf/pull/9793 forward * Removing private label on conformance linkage * no-op comment added
2 years ago
target_include_directories(conformance_cpp PRIVATE ${ABSL_ROOT_DIR})
Build test protos into a common shared library in cmake. This will reduce the number of times our test protos are built, and may fix the flakes we're seeing in aarch64. At the very least, it should reduce them by a factor of 3 and marginally speed up our builds. PiperOrigin-RevId: 568963559
1 year ago
target_link_libraries(conformance_test_runner
libconformance_common
${protobuf_LIB_PROTOBUF}
${protobuf_ABSL_USED_TARGETS}
)
target_link_libraries(conformance_cpp
libconformance_common
${protobuf_LIB_PROTOBUF}
${protobuf_ABSL_USED_TARGETS}
)
Implement cmake linux tests (#10306) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Deleting extract_includes.bat now that it's been replaced with the generated file_lists.cmake * Removing unnecessary endif conditions
2 years ago
Add CMake Ninja test (#10314) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Updating gitignore file to include cmake generated files * Updating existing cmake tests to use newer docker image * Adding CMake build that uses Ninja as the generator * Updating CMake documentation to cover Linux support * Updating to latest cmake image
2 years ago
add_test(NAME conformance_cpp_test
Migrate remaining compiler code to from std::map to Swiss tables. This cl hit an issue during the shared library cmake build from ODR violations, leading to mismatched absl hash seeds. The problem was pre-existing but didn't manifest until now, and can be traced to the fact that in shared library builds we linked Abseil statically. All of the cmake changes here remove the underlying ODR violation. PiperOrigin-RevId: 485787671
2 years ago
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/conformance_test_runner
Add CMake Ninja test (#10314) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Updating gitignore file to include cmake generated files * Updating existing cmake tests to use newer docker image * Adding CMake build that uses Ninja as the generator * Updating CMake documentation to cover Linux support * Updating to latest cmake image
2 years ago
--failure_list ${protobuf_SOURCE_DIR}/conformance/failure_list_cpp.txt
--text_format_failure_list ${protobuf_SOURCE_DIR}/conformance/text_format_failure_list_cpp.txt
Implement cmake linux tests (#10306) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Deleting extract_includes.bat now that it's been replaced with the generated file_lists.cmake * Removing unnecessary endif conditions
2 years ago
--output_dir ${protobuf_TEST_XML_OUTDIR}
Enable conformance tests over editions protos We transformed the proto2/proto3 protos to editions, and then run the same set of tests over both. This will verify that migrating to editions preserves the same proto2/proto3 behavior. These will not be enabled by default, and require a flag `--maximum_edition=2023`. Future changes will: - add more targeted editions-specific tests - clean up our conformance test framework to allow for more targeted tests - add wildcards to failure lists in limited cases to reduce noise - add feature resolution conformance tests PiperOrigin-RevId: 574570607
1 year ago
--maximum_edition 2023
Add CMake Ninja test (#10314) * Initial implementation of cmake tests for linux * Reverting accidental distcheck changes * Updating gitignore file to include cmake generated files * Updating existing cmake tests to use newer docker image * Adding CMake build that uses Ninja as the generator * Updating CMake documentation to cover Linux support * Updating to latest cmake image
2 years ago
${CMAKE_CURRENT_BINARY_DIR}/conformance_cpp
DEPENDS conformance_test_runner conformance_cpp)
Make jsoncpp a formal dependency (#10739) * Adding jsoncpp submodule * Adding bazel dependency * Hook up jsoncpp in Bazel builds * Hook up jsoncpp dependency in CMake * Fix conformance binary path * Move jsoncpp import to the end of the file to avoid confusing add_test
2 years ago
set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Disable tests")
Enable the selection of system provided jsoncpp (#12577) Allows the use of an external `jsoncpp` library to be used. Replicates the model used by `abseil-cpp` as a "package" or "module" to the `protobuf_JSONCPP_PROVIDER` option. Resolves: #11827 Closes #12577 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12577 from omenos:omenos/cmake-jsoncpp 073edd69b4d3c57a37c00f1ba992e6cbd1dad949 PiperOrigin-RevId: 528492610
2 years ago
if(protobuf_JSONCPP_PROVIDER STREQUAL "module")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp third_party/jsoncpp)
target_include_directories(conformance_test_runner PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp/include)
CMake: Use the correct jsoncpp target name in static builds (#12733) When building protobuf with BUILD_SHARED_LIBS disabled, conformance_test_runner should link jsoncpp_static but not jsoncpp_lib. Closes #12733 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12733 from semlanik:main 2ab4be6bb0aa93020987702faa0dc3ece616edb7 PiperOrigin-RevId: 530926843
2 years ago
if(BUILD_SHARED_LIBS)
target_link_libraries(conformance_test_runner jsoncpp_lib)
else()
target_link_libraries(conformance_test_runner jsoncpp_static)
endif()
Enable the selection of system provided jsoncpp (#12577) Allows the use of an external `jsoncpp` library to be used. Replicates the model used by `abseil-cpp` as a "package" or "module" to the `protobuf_JSONCPP_PROVIDER` option. Resolves: #11827 Closes #12577 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12577 from omenos:omenos/cmake-jsoncpp 073edd69b4d3c57a37c00f1ba992e6cbd1dad949 PiperOrigin-RevId: 528492610
2 years ago
else()
target_link_libraries(conformance_test_runner jsoncpp)
endif()