From 415e8215fd8f64221168d5e13ab49cd7bee9508c Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 13 Aug 2024 19:55:12 -0400 Subject: [PATCH] update test engine linkage --- cmake/imgui.cmake | 5 ++--- src/app/CMakeLists.txt | 1 + src/test/yaze_test.cc | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/imgui.cmake b/cmake/imgui.cmake index 1b552f32..bde97cee 100644 --- a/cmake/imgui.cmake +++ b/cmake/imgui.cmake @@ -36,6 +36,5 @@ set( ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp ) -if (LINUX OR MINGW) - add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1") -endif() \ No newline at end of file +# For integration test +add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1") \ No newline at end of file diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 65e87ae6..54bfda43 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -33,6 +33,7 @@ target_link_libraries( ${PNG_LIBRARIES} ${CMAKE_DL_LIBS} ImGui + ImGuiTestEngine ) if (APPLE) diff --git a/src/test/yaze_test.cc b/src/test/yaze_test.cc index c1fa622e..2e0d5124 100644 --- a/src/test/yaze_test.cc +++ b/src/test/yaze_test.cc @@ -7,6 +7,7 @@ #include "absl/debugging/symbolize.h" #include "app/core/controller.h" #include "imgui/imgui.h" +#include "imgui_test_engine/imgui_te_context.h" #include "imgui_test_engine/imgui_te_engine.h" #include "test/integration/test_editor.h" @@ -32,7 +33,7 @@ int main(int argc, char* argv[]) { while (controller.IsActive()) { controller.OnInput(); - if (!controller.OnLoad().ok()) { + if (const auto status = controller.OnTestLoad(); !status.ok()) { return EXIT_FAILURE; } controller.DoRender();