Skip to content

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

Merged
dirk-thomas merged 3 commits intomasterfrom
dirk-thomas/bom-generated-code
Jul 31, 2019
Merged

fix condition to not skip FastRTPS to FastRTPS pub/sub tests#377
dirk-thomas merged 3 commits intomasterfrom
dirk-thomas/bom-generated-code

Conversation

@dirk-thomas
Copy link
Copy Markdown
Member

@dirk-thomas dirk-thomas commented Jul 18, 2019 •
edited
Loading

@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
@dirk-thomas dirk-thomas mentioned this pull request Jul 18, 2019
Merged
wjwwood
wjwwood reviewed Jul 18, 2019
View reviewed changes
wjwwood
wjwwood approved these changes Jul 18, 2019
View reviewed changes
Copy link
Copy Markdown
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
Copy Markdown
Member Author

dirk-thomas commented Jul 19, 2019

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.

system_tests/test_communication/CMakeLists.txt

Line 190 in f1771f4

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
Copy Markdown
Member Author

dirk-thomas commented Jul 19, 2019

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).

This was referenced Jul 19, 2019
Merged
Closed
@dirk-thomas
Copy link
Copy Markdown
Member Author

dirk-thomas commented Jul 19, 2019

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
fix condition to not skip FastRTPS to FastRTPS pub/sub tests
3f4c76c 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas
fix and simplify comparison logic
facb800 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@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
skip WStrings on macOS from FastRTPS to Connext
49cdb2f 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@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

Reviewers

@wjwwood wjwwood wjwwood approved these changes

@nuclearsandwich nuclearsandwich nuclearsandwich approved these changes

@ivanpauno ivanpauno ivanpauno approved these changes

Assignees

@dirk-thomas dirk-thomas

Labels

bug Something isn't working in review Waiting for review (Kanban column)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dirk-thomas @wjwwood @nuclearsandwich @ivanpauno