gmock - Don't pass FALSE value to ament_add_test when SKIP_TEST is not provided

[emersonknapp]

CMake parsed "option" arguments come out as TRUE or FALSE values.
When ament_add_gmock does not receive the SKIP_TEST option, it passes an unmarked "FALSE" to ament_add_test.

This reveals itself as a problem in any example that uses ENV (or any other multi-value argument)

ament_add_gmock(my_test
  some_test_file.cpp
  ENV RMW_IMPLEMENTATION=rmw_fastrtps_cpp)

This makes the ENV argument be parsed in ament_add_test as

RMW_IMPLEMENTATION=rmw_fastrtps_cpp;FALSE

This results in the last environment variable having ";FALSE" appended to it, e.g.

1: Test command: /usr/bin/python3 "-u" "/ws/install/ament_cmake_test/share/ament_cmake_test/cmake/run_test.py" "/ws/build/rosbag2_transport/test_results/rosbag2_transport/test_info__rmw_connext_cpp.gtest.xml" "--package-name" "rosbag2_tra
nsport" "--output-file" "/ws/build/rosbag2_transport/ament_cmake_gmock/test_info__rmw_connext_cpp.txt" "--env" "RMW_IMPLEMENTATION=rmw_connext_cpp" "FALSE" "--command" "/ws/build/rosbag2_transport/test_info__rmw_connext_cpp" "--gtest_outp
ut=xml:/ws/build/rosbag2_transport/test_results/rosbag2_transport/test_info__rmw_connext_cpp.gtest.xml"                                                                                                                                       
1: Test timeout computed to be: 60                                                                                                                                                                                                            
1: -- run_test.py: extra environment variables:                                                                                                                                                                                               
1:  - RMW_IMPLEMENTATION=rmw_connext_cpp;FALSE                                                                                                                                                                                                
1: -- run_test.py: invoking following command in '/ws/build/rosbag2_transport':                                                                                                                                                               
1:  - /ws/build/rosbag2_transport/test_info__rmw_connext_cpp --gtest_output=xml:/ws/build/rosbag2_transport/test_results/rosbag2_transport/test_info__rmw_connext_cpp.gtest.xml                                                               
1: [ERROR] [1585880528.876809338] [rcl]: Expected RMW implementation identifier of 'rmw_connext_cpp;FALSE' but instead found 'rmw_connext_cpp', exiting with 102.                  

• Linux
• Linux-aarch64
• macOS
• Windows

Signed-off-by: Emerson Knapp emerson.b.knapp@gmail.com

[thomas-moulard]

LGTM!

[dirk-thomas]

I moved the added line to the previous location to minimize the diff: df9814b.

[dirk-thomas]

Can you please squash the commits to make the DCO happy (sorry, didn't think about that when doing the edit through the web interface).

[emersonknapp]

@dirk-thomas done, thanks for the review

[dirk-thomas]

Thanks for the fix.