Skip to content

Commit

Permalink
Disable any cross-vendor communication tests for Fast-RTPS. (#322)
Browse files Browse the repository at this point in the history
* Disable any cross-vendor communication tests for Fast-RTPS.

Builds are actually failing for all cross-vendor tests involving
rmw_fastrtps_cpp not just those between Connext and Fast-RTPS.

* Address linter feedback.
  • Loading branch information
nuclearsandwich authored and sloretz committed Dec 14, 2018
1 parent 5036f5b commit d3d8ff1
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions test_communication/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,27 +159,15 @@ if(BUILD_TESTING)
set(SKIP_TEST "")

# TODO(wjwwood): Connext and Fast-RTPS do not currently communicate over pub/sub
set(rmw_implementation1_is_connext FALSE)
set(rmw_implementation1_is_fastrtps FALSE)
set(rmw_implementation2_is_connext FALSE)
set(rmw_implementation2_is_fastrtps FALSE)
if(rmw_implementation1 MATCHES "(.*)connext(.*)")
set(rmw_implementation1_is_connext TRUE)
endif()
if(rmw_implementation1 MATCHES "(.*)fastrtps(.*)")
set(rmw_implementation1_is_fastrtps TRUE)
endif()
if(rmw_implementation2 MATCHES "(.*)connext(.*)")
set(rmw_implementation2_is_connext TRUE)
endif()
if(rmw_implementation2 MATCHES "(.*)fastrtps(.*)")
set(rmw_implementation2_is_fastrtps TRUE)
endif()
if(
WIN32 AND (
(rmw_implementation1_is_connext AND rmw_implementation2_is_fastrtps) OR
(rmw_implementation1_is_fastrtps AND rmw_implementation2_is_connext))
)
if(WIN32 AND (rmw_implementation1_is_fastrtps OR rmw_implementation2_is_fastrtps))
set(SKIP_TEST "SKIP_TEST")
endif()

Expand Down

0 comments on commit d3d8ff1

Please sign in to comment.