diff --git a/rcl/test/CMakeLists.txt b/rcl/test/CMakeLists.txt index 5be75966c..f555ab1f1 100644 --- a/rcl/test/CMakeLists.txt +++ b/rcl/test/CMakeLists.txt @@ -78,6 +78,7 @@ function(test_target_function) rcl_add_custom_gtest(test_lexer_lookahead${target_suffix} SRCS rcl/test_lexer_lookahead.cpp + INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS} ENV ${extra_test_env} APPEND_LIBRARY_DIRS ${extra_lib_dirs} LIBRARIES ${PROJECT_NAME} ${extra_test_libraries} diff --git a/rcl/test/rcl/test_lexer_lookahead.cpp b/rcl/test/rcl/test_lexer_lookahead.cpp index 54d0f285b..53c094d6e 100644 --- a/rcl/test/rcl/test_lexer_lookahead.cpp +++ b/rcl/test/rcl/test_lexer_lookahead.cpp @@ -16,7 +16,7 @@ #include -#include "../scope_exit.hpp" +#include "osrf_testing_tools_cpp/scope_exit.hpp" #include "rcl/error_handling.h" #include "rcl/lexer_lookahead.h" @@ -46,7 +46,7 @@ class CLASSNAME (TestLexerLookaheadFixture, RMW_IMPLEMENTATION) : public ::testi rcl_ret_t ret = rcl_lexer_lookahead2_init(&name, text, rcl_get_default_allocator()); \ ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe(); \ } \ - auto __scope_lookahead2_ ## name = make_scope_exit( \ + auto __scope_lookahead2_ ## name = osrf_testing_tools_cpp::make_scope_exit( \ [&name]() { \ rcl_ret_t ret = rcl_lexer_lookahead2_fini(&buffer); \ ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string_safe(); \