From a87a11f92fd648d84cffa71bab5ecd7653b18329 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 18 Nov 2023 18:06:04 +0200 Subject: [PATCH] fix(tests) fix UI tests when run from scratch The STATUSQ_SHADOW_BUILD will allow loading the qml files from sources The StatusQ dependency helps building StatusQ which is used for C++ helpers Updates #12639 ghstack-source-id: cbe0a994e71580746fcdc3d8c90b96f4fb307bd3 Pull Request resolved: https://github.com/status-im/status-desktop/pull/12787 --- Makefile | 1 + ui/StatusQ/tests/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index f1b6cfce67..e9252bdd42 100644 --- a/Makefile +++ b/Makefile @@ -314,6 +314,7 @@ statusq-tests: -DSTATUSQ_BUILD_SANDBOX=OFF \ -DSTATUSQ_BUILD_SANITY_CHECKER=OFF \ -DSTATUSQ_BUILD_TESTS=ON \ + -DSTATUSQ_SHADOW_BUILD=OFF \ -B $(STATUSQ_BUILD_PATH) \ -S $(STATUSQ_SOURCE_PATH) \ $(HANDLE_OUTPUT) diff --git a/ui/StatusQ/tests/CMakeLists.txt b/ui/StatusQ/tests/CMakeLists.txt index 9bdb83f08f..2edbea7f41 100644 --- a/ui/StatusQ/tests/CMakeLists.txt +++ b/ui/StatusQ/tests/CMakeLists.txt @@ -15,6 +15,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") add_executable(${PROJECT_NAME} main.cpp) +add_dependencies(${PROJECT_NAME} StatusQ) add_test(NAME ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} -input "${CMAKE_CURRENT_SOURCE_DIR}")