Merge branch 'update-test-tracetools-rmw-fastrtps-cpp' into 'master'

Run rmw-related test_tracetools test with rmw_fastrtps

See merge request ros-tracing/ros2_tracing!289

Author: christophebedard

instrumented.repos

@@ -11,3 +11,7 @@ repositories:
     type: git
     url: https://github.com/ros2/rmw_cyclonedds.git
     version: master
+  ros2/rmw_fastrtps:
+    type: git
+    url: https://github.com/ros2/rmw_fastrtps.git
+    version: master

test_tracetools/test/test_pub_sub.py

@@ -14,7 +14,6 @@
 
 import unittest
 
-from launch.actions import SetEnvironmentVariable
 from tracetools_test.case import TraceTestCase
 from tracetools_trace.tools import tracepoints as tp
 
@@ -40,8 +39,6 @@ def __init__(self, *args) -> None:
             ],
             package='test_tracetools',
             nodes=['test_ping', 'test_pong'],
-            # Need rmw_cyclonedds_cpp for the rmw instrumentation
-            additional_actions=SetEnvironmentVariable('RMW_IMPLEMENTATION', 'rmw_cyclonedds_cpp'),
         )
 
     def test_all(self):

test_tracetools/test/test_publisher.py

@@ -15,7 +15,6 @@
 
 import unittest
 
-from launch.actions import SetEnvironmentVariable
 from tracetools_test.case import TraceTestCase
 from tracetools_trace.tools import tracepoints as tp
 
@@ -36,8 +35,6 @@ def __init__(self, *args) -> None:
             ],
             package='test_tracetools',
             nodes=['test_publisher'],
-            # Need rmw_cyclonedds_cpp for the rmw instrumentation
-            additional_actions=SetEnvironmentVariable('RMW_IMPLEMENTATION', 'rmw_cyclonedds_cpp'),
         )
 
     def test_all(self):

test_tracetools/test/test_subscription.py

@@ -16,7 +16,6 @@
 
 import unittest
 
-from launch.actions import SetEnvironmentVariable
 from tracetools_test.case import TraceTestCase
 from tracetools_trace.tools import tracepoints as tp
 
@@ -42,8 +41,6 @@ def __init__(self, *args) -> None:
             ],
             package='test_tracetools',
             nodes=['test_ping', 'test_pong'],
-            # Need rmw_cyclonedds_cpp for the rmw instrumentation
-            additional_actions=SetEnvironmentVariable('RMW_IMPLEMENTATION', 'rmw_cyclonedds_cpp'),
         )
 
     def test_all(self):