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

fix condition to not skip FastRTPS to FastRTPS pub/sub tests #377

Merged
merged 3 commits into from
Jul 31, 2019

Conversation

dirk-thomas
Copy link
Member

@dirk-thomas dirk-thomas commented Jul 18, 2019

@dirk-thomas dirk-thomas added bug Something isn't working in review Waiting for review (Kanban column) labels Jul 18, 2019
@dirk-thomas dirk-thomas self-assigned this Jul 18, 2019
Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the logic makes sense as-is with the EQUAL, but in this scenario (XOR?) I'd expect (A OR B) AND NOT (A AND B).

@dirk-thomas dirk-thomas force-pushed the dirk-thomas/bom-generated-code branch from d482770 to 5ce5f12 Compare July 19, 2019 04:07
@dirk-thomas
Copy link
Member Author

The XOR can be expresses as NOT "${rmw1_isFastRTPS}" STREQUAL "{$rmw2_isFastRTPS}. Done in 5ce5f12.

Just using NOT rmw1_isFastRTPS EQUAL rmw2_isFastRTPS doesn't work - that is why the STREQUAL workaround is used in other places already: e.g.

NOT "${rmw_implementation1_is_opensplice}" STREQUAL "${rmw_implementation2_is_opensplice}"

The additional condition (rmw_implementation1_is_fastrtps OR rmw_implementation2_is_fastrtps) is redundant and can be removed.

@dirk-thomas
Copy link
Member Author

This current patch successfully re-enables the FastRTPS-to-FastRTPS tests: see https://ci.ros2.org/job/ci_windows/7441/ (the build failed since it also uses ros2/test_interface_files#8).

@dirk-thomas
Copy link
Member Author

With the tests enabled the build fails (https://ci.ros2.org/job/ci_windows/7441/) due to a bug in launch: ros2/launch#280.

@dirk-thomas dirk-thomas force-pushed the dirk-thomas/bom-generated-code branch 3 times, most recently from ff60880 to facb800 Compare July 26, 2019 21:46
@dirk-thomas dirk-thomas force-pushed the dirk-thomas/bom-generated-code branch from 5d100b6 to 49cdb2f Compare July 30, 2019 21:36
@dirk-thomas dirk-thomas merged commit 7abe5f9 into master Jul 31, 2019
@delete-merged-branch delete-merged-branch bot deleted the dirk-thomas/bom-generated-code branch July 31, 2019 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working in review Waiting for review (Kanban column)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants