Skip to content

Improve testing integration #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tomk-amd wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Improve testing integration #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ option(ROCPROFVIS_DEVELOPER_MODE "Enable developer mode features" OFF)
option(ROCPROFVIS_ENABLE_INTERNAL_BANNER "Show diagonal internal build banner" OFF)
option(USE_NATIVE_FILE_DIALOG "Use the OS native file dialog instead of ImGui file dialog" ON)
option(GLFW_LINK_STATIC "Link GLFW statically instead of dynamically" OFF)
option(BUILD_TESTING "Build the testing tree" ON)

if(APPLE AND USE_NATIVE_FILE_DIALOG)
set(USE_NATIVE_FILE_DIALOG OFF CACHE BOOL
Expand Down Expand Up @@ -52,6 +53,12 @@ else()
set(GLFW_LIBRARY_TYPE "SHARED" CACHE STRING "GLFW library type" FORCE)
endif()

# Enable testing if BUILD_TESTING is ON
if(BUILD_TESTING)
enable_testing()
include(CTest)
endif()

# Add third-party libraries, core, and model BEFORE controller
add_subdirectory(thirdparty)
add_subdirectory(src/core)
Expand Down
26 changes: 16 additions & 10 deletions src/controller/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,23 @@ target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../core/inc)
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)

add_executable(${PROJECT_NAME}-basic-tests tests/basic_tests.cpp)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE Catch2::Catch2WithMain)

if(COMPUTE_UI_SUPPORT)
target_link_libraries(${TARGET_NAME} PUBLIC csv)
# Csv parser enables coverage in debug builds so we need to enable it too
if((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT CMAKE_BUILD_TYPE))
target_link_options(${PROJECT_NAME}-basic-tests PRIVATE --coverage)
endif()
endif()

add_test(NAME ${PROJECT_NAME}-basic-tests COMMAND ${PROJECT_NAME}-basic-tests)
set_tests_properties(${PROJECT_NAME}-basic-tests PROPERTIES RUN_SERIAL ON)
if(BUILD_TESTING)
add_executable(${PROJECT_NAME}-basic-tests tests/basic_tests.cpp)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE Catch2::Catch2WithMain)

if(COMPUTE_UI_SUPPORT)
# Csv parser enables coverage in debug builds so we need to enable it too
if((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT CMAKE_BUILD_TYPE))
target_link_options(${PROJECT_NAME}-basic-tests PRIVATE --coverage)
endif()
endif()

add_test(NAME ${PROJECT_NAME}-basic-tests COMMAND ${PROJECT_NAME}-basic-tests)
set_tests_properties(${PROJECT_NAME}-basic-tests PROPERTIES RUN_SERIAL ON)
set_tests_properties(${PROJECT_NAME}-basic-tests PROPERTIES WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
endif()
4 changes: 2 additions & 2 deletions src/controller/tests/basic_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define MULTI_LINE_LOG_ARGS "{:.{}}",multi_line_log.data(),multi_line_log.size()


std::string g_input_file="../../../sample/trace_70b_1024_32.rpd";
std::string g_input_file="sample/trace_70b_1024_32.rpd";
bool g_all_tracks=false;
bool g_full_range=false;

Expand Down Expand Up @@ -84,7 +84,7 @@ TEST_CASE_PERSISTENT_FIXTURE(RocProfVisControllerFixture, "Tests for the Control
REQUIRE(nullptr != m_controller);
}

SECTION("Controller Initialisation")
SECTION("Controller Initialization")
{
spdlog::info("Allocating Future");
rocprofvis_controller_future_t* future = rocprofvis_controller_future_alloc();
Expand Down
25 changes: 14 additions & 11 deletions src/model/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,17 @@ target_link_libraries(${PROJECT_NAME}-test spdlog)
target_link_libraries(${PROJECT_NAME}-test sqlite3)
target_link_libraries(${PROJECT_NAME}-test json)

add_executable(${PROJECT_NAME}-basic-tests src/tests/basic_tests.cpp)
target_include_directories(${PROJECT_NAME}-basic-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../core/inc)
target_include_directories(${PROJECT_NAME}-basic-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/jsoncpp)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE Catch2::Catch2WithMain)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE roc-optiq-core)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE spdlog)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE sqlite3)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE json)
add_test(NAME ${PROJECT_NAME}-basic-tests COMMAND ${PROJECT_NAME}-basic-tests)
set_tests_properties(${PROJECT_NAME}-basic-tests PROPERTIES RUN_SERIAL ON)
if(BUILD_TESTING)
add_executable(${PROJECT_NAME}-basic-tests src/tests/basic_tests.cpp)
target_include_directories(${PROJECT_NAME}-basic-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../core/inc)
target_include_directories(${PROJECT_NAME}-basic-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/jsoncpp)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE ${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE Catch2::Catch2WithMain)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE roc-optiq-core)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE spdlog)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE sqlite3)
target_link_libraries(${PROJECT_NAME}-basic-tests PRIVATE json)
add_test(NAME ${PROJECT_NAME}-basic-tests COMMAND ${PROJECT_NAME}-basic-tests)
set_tests_properties(${PROJECT_NAME}-basic-tests PROPERTIES RUN_SERIAL ON)
set_tests_properties(${PROJECT_NAME}-basic-tests PROPERTIES WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
endif()
2 changes: 1 addition & 1 deletion src/model/src/tests/basic_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define MULTI_LINE_LOG(format, ...) fmt::format_to(std::back_inserter(multi_line_log), format, __VA_ARGS__)
#define MULTI_LINE_LOG_ARGS "{:.{}}",multi_line_log.data(),multi_line_log.size()

std::string g_input_file="../../../sample/trace_70b_1024_32.rpd";
std::string g_input_file="sample/trace_70b_1024_32.rpd";
bool g_all_tracks=false;
bool g_full_range=false;

Expand Down