File tree Expand file tree Collapse file tree 2 files changed +20
-22
lines changed Expand file tree Collapse file tree 2 files changed +20
-22
lines changed Original file line number Diff line number Diff line change @@ -15,22 +15,17 @@ jobs:
1515 runs-on : ${{ matrix.os }}
1616 strategy :
1717 matrix :
18- os : [ubuntu-20 .04]
18+ os : [ubuntu-22 .04]
1919
2020 steps :
2121 - uses : actions/checkout@v2
2222
2323 - name : Install Conan
2424 id : conan
2525 uses : turtlebrowser/get-conan@main
26- with :
27- version : 1.59.0
2826
2927 - name : Create default profile
30- run : conan profile new default --detect
31-
32- - name : Update profile
33- run : conan profile update settings.compiler.libcxx=libstdc++11 default
28+ run : conan profile detect
3429
3530 - name : Create Build Environment
3631 # Some projects don't allow in-source building, so create a separate build directory
@@ -44,16 +39,16 @@ jobs:
4439 - name : Configure CMake
4540 shell : bash
4641 working-directory : ${{github.workspace}}/build
47- run : cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
42+ run : cmake ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
4843
4944 - name : Build
5045 shell : bash
5146 working-directory : ${{github.workspace}}/build
5247 run : cmake --build . --config ${{env.BUILD_TYPE}}
5348
5449 - name : run test (Linux)
55- working-directory : ${{github.workspace}}/build
56- run : ./tests/behaviortree_cpp_test
50+ working-directory : ${{github.workspace}}/build/tests
51+ run : ctest
5752
5853 - name : Upload coverage reports to Codecov
5954 uses : codecov/codecov-action@v3
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ set(BT_TESTS
3333 test_helper.hpp
3434)
3535
36- set (TEST_DEPENDECIES
36+ set (TEST_DEPENDENCIES
3737 ${BTCPP_LIBRARY}
3838 foonathan::lexy
3939 bt_sample_nodes)
@@ -42,32 +42,35 @@ if(ament_cmake_FOUND)
4242
4343 find_package (ament_cmake_gtest REQUIRED)
4444
45- ament_add_gtest(${BTCPP_LIBRARY} _test ${BT_TESTS} )
46- target_link_libraries (${BTCPP_LIBRARY} _test
45+ ament_add_gtest(behaviortree_cpp_test ${BT_TESTS} )
46+ target_link_libraries (behaviortree_cpp_test
4747 ${TEST_DEPENDECIES}
4848 ${ament_LIBRARIES} )
4949
5050elseif (catkin_FOUND AND CATKIN_ENABLE_TESTING)
5151
52- catkin_add_gtest(${BTCPP_LIBRARY} _test ${BT_TESTS} )
53- target_link_libraries (${BTCPP_LIBRARY} _test
52+ catkin_add_gtest(behaviortree_cpp_test ${BT_TESTS} )
53+ target_link_libraries (behaviortree_cpp_test
5454 ${TEST_DEPENDECIES}
5555 Threads::Threads
5656 ${catkin_LIBRARIES} )
5757
5858else ()
5959
6060 find_package (GTest REQUIRED)
61+
6162 enable_testing ()
6263
63- add_executable (${BTCPP_LIBRARY} _test ${BT_TESTS} )
64+ add_executable (behaviortree_cpp_test ${BT_TESTS} )
6465
65- target_link_libraries (${PROJECT_NAME} _test
66- ${TEST_DEPENDECIES}
67- Threads::Threads
68- GTest::gtest)
66+ add_test (NAME btcpp_test COMMAND behaviortree_cpp_test)
67+
68+ target_link_libraries (behaviortree_cpp_test
69+ ${TEST_DEPENDENCIES}
70+ GTest::gtest
71+ GTest::gtest_main)
6972
7073endif ()
7174
72- target_include_directories (${BTCPP_LIBRARY} _test PRIVATE include ${PROJECT_SOURCE_DIR} /3rdparty)
73- target_compile_definitions (${BTCPP_LIBRARY} _test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR} " )
75+ target_include_directories (behaviortree_cpp_test PRIVATE include ${PROJECT_SOURCE_DIR} /3rdparty)
76+ target_compile_definitions (behaviortree_cpp_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR} " )
You can’t perform that action at this time.
0 commit comments