Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support of googletest using colcon [12009] (backport #2054) #2595

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2022

This is an automatic backport of pull request #2054 done by Mergify.
Cherry-pick of 4f9f7e9 has failed:

On branch mergify/bp/2.1.x/pr-2054
Your branch is up to date with 'origin/2.1.x'.

You are currently cherry-picking commit 4f9f7e98e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cmake/common/gtest.cmake
	deleted:    cmake/modules/FindGMock.cmake
	modified:   colcon.pkg
	modified:   test/CMakeLists.txt
	modified:   test/realtime/mutex_testing_tool/CMakeLists.txt
	modified:   test/unittest/CMakeLists.txt
	modified:   test/unittest/dds/participant/CMakeLists.txt
	modified:   test/unittest/dds/subscriber/CMakeLists.txt
	modified:   test/unittest/dds/topic/CMakeLists.txt
	modified:   test/unittest/rtps/builtin/CMakeLists.txt
	modified:   test/unittest/rtps/discovery/CMakeLists.txt
	modified:   test/unittest/rtps/history/CMakeLists.txt
	modified:   test/unittest/rtps/reader/CMakeLists.txt
	modified:   test/unittest/security/cryptography/CMakeLists.txt
	modified:   test/unittest/security/logging/CMakeLists.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   examples/C++/DDS/DeadlineQoSExample/CMakeLists.txt
	both modified:   examples/C++/DeadlineQoSExample/CMakeLists.txt
	both modified:   test/blackbox/CMakeLists.txt
	both modified:   test/communication/CMakeLists.txt
	both modified:   test/performance/CMakeLists.txt
	both modified:   test/performance/latency/CMakeLists.txt
	both modified:   test/performance/throughput/CMakeLists.txt
	both modified:   test/performance/video/CMakeLists.txt
	both modified:   test/profiling/CMakeLists.txt
	both modified:   test/realtime/CMakeLists.txt
	deleted by us:   test/unittest/dds/collections/CMakeLists.txt
	deleted by us:   test/unittest/dds/core/condition/CMakeLists.txt
	deleted by us:   test/unittest/dds/core/entity/CMakeLists.txt
	both modified:   test/unittest/dds/publisher/CMakeLists.txt
	both modified:   test/unittest/dds/status/CMakeLists.txt
	both modified:   test/unittest/dynamic_types/CMakeLists.txt
	both modified:   test/unittest/logging/CMakeLists.txt
	deleted by us:   test/unittest/logging/log_macros/CMakeLists.txt
	both modified:   test/unittest/rtps/common/CMakeLists.txt
	both modified:   test/unittest/rtps/flowcontrol/CMakeLists.txt
	both modified:   test/unittest/rtps/network/CMakeLists.txt
	both modified:   test/unittest/rtps/persistence/CMakeLists.txt
	both modified:   test/unittest/rtps/resources/timedevent/CMakeLists.txt
	both modified:   test/unittest/rtps/security/CMakeLists.txt
	both modified:   test/unittest/rtps/writer/CMakeLists.txt
	both modified:   test/unittest/security/accesscontrol/CMakeLists.txt
	both modified:   test/unittest/security/authentication/CMakeLists.txt
	deleted by us:   test/unittest/statistics/dds/CMakeLists.txt
	deleted by us:   test/unittest/statistics/rtps/CMakeLists.txt
	both modified:   test/unittest/transport/CMakeLists.txt
	both modified:   test/unittest/utils/CMakeLists.txt
	both modified:   test/unittest/xmlparser/CMakeLists.txt
	both modified:   test/unittest/xtypes/CMakeLists.txt
	both modified:   test/xtypes/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #11961. New support of googletest using colcon

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. Fix compilation errors

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. Fix compilation error

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. Including asio in a good way

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. gmock exports gtest

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. Forget to remove one include_directories

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. Little change

Signed-off-by: Ricardo González <ricardo@richiware.dev>

* Refs #11961. Fix error

Signed-off-by: Ricardo González <ricardo@richiware.dev>
(cherry picked from commit 4f9f7e9)

# Conflicts:
#	examples/C++/DDS/DeadlineQoSExample/CMakeLists.txt
#	examples/C++/DeadlineQoSExample/CMakeLists.txt
#	test/blackbox/CMakeLists.txt
#	test/communication/CMakeLists.txt
#	test/performance/CMakeLists.txt
#	test/performance/latency/CMakeLists.txt
#	test/performance/throughput/CMakeLists.txt
#	test/performance/video/CMakeLists.txt
#	test/profiling/CMakeLists.txt
#	test/realtime/CMakeLists.txt
#	test/unittest/dds/collections/CMakeLists.txt
#	test/unittest/dds/core/condition/CMakeLists.txt
#	test/unittest/dds/core/entity/CMakeLists.txt
#	test/unittest/dds/publisher/CMakeLists.txt
#	test/unittest/dds/status/CMakeLists.txt
#	test/unittest/dynamic_types/CMakeLists.txt
#	test/unittest/logging/CMakeLists.txt
#	test/unittest/logging/log_macros/CMakeLists.txt
#	test/unittest/rtps/common/CMakeLists.txt
#	test/unittest/rtps/flowcontrol/CMakeLists.txt
#	test/unittest/rtps/network/CMakeLists.txt
#	test/unittest/rtps/persistence/CMakeLists.txt
#	test/unittest/rtps/resources/timedevent/CMakeLists.txt
#	test/unittest/rtps/security/CMakeLists.txt
#	test/unittest/rtps/writer/CMakeLists.txt
#	test/unittest/security/accesscontrol/CMakeLists.txt
#	test/unittest/security/authentication/CMakeLists.txt
#	test/unittest/statistics/dds/CMakeLists.txt
#	test/unittest/statistics/rtps/CMakeLists.txt
#	test/unittest/transport/CMakeLists.txt
#	test/unittest/utils/CMakeLists.txt
#	test/unittest/xmlparser/CMakeLists.txt
#	test/unittest/xtypes/CMakeLists.txt
#	test/xtypes/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 22, 2022
@richiprosima
Copy link
Contributor

Can't set status; build failed.

@JLBuenoLopez JLBuenoLopez added this to the v2.1.2 milestone Jul 19, 2022
@JLBuenoLopez
Copy link
Contributor

Closed in favor of #2852

@mergify mergify bot deleted the mergify/bp/2.1.x/pr-2054 branch July 19, 2022 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants