From b5d81eefc6f2d70711efd2b28234bf13c5bc4f5d Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 27 Feb 2023 22:14:35 +0100 Subject: [PATCH] Avoid remaining symlinks for testfiles --- plasmoid/CMakeLists.txt | 3 +++ plasmoid/testfiles/mocks | 1 - syncthing/CMakeLists.txt | 3 +++ syncthing/testfiles/testconfig | 1 - testhelper/CMakeLists.txt | 3 +++ testhelper/testfiles/testconfig | 1 - tray/CMakeLists.txt | 3 +++ tray/testfiles/mocks | 1 - 8 files changed, 12 insertions(+), 4 deletions(-) delete mode 120000 plasmoid/testfiles/mocks delete mode 120000 syncthing/testfiles/testconfig delete mode 120000 testhelper/testfiles/testconfig delete mode 120000 tray/testfiles/mocks diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt index 2464d66..8f40bcf 100644 --- a/plasmoid/CMakeLists.txt +++ b/plasmoid/CMakeLists.txt @@ -8,6 +8,9 @@ set(META_PROJECT_TYPE qtplugin) set(META_PLUGIN_CATEGORY plasma/applets) set(META_QT5_VERSION 5.8) +# use testfiles directory from syncthingconnector +set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector") + # source files set(PLASMOID_FILES package/contents/ui/CompactRepresentation.qml diff --git a/plasmoid/testfiles/mocks b/plasmoid/testfiles/mocks deleted file mode 120000 index 447706a..0000000 --- a/plasmoid/testfiles/mocks +++ /dev/null @@ -1 +0,0 @@ -../../connector/testfiles/mocks \ No newline at end of file diff --git a/syncthing/CMakeLists.txt b/syncthing/CMakeLists.txt index 04be1a9..5db993b 100644 --- a/syncthing/CMakeLists.txt +++ b/syncthing/CMakeLists.txt @@ -8,6 +8,9 @@ set(META_APP_DESCRIPTION "Syncthing itself, built as a shared or static library" set(META_PROJECT_VARNAME_UPPER LIB_SYNCTHING) set(META_SYNCTHING_VERSION "v1.23.1") +# use testfiles directory from syncthingconnector +set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector") + # add project files set(HEADER_FILES interface.h) set(SRC_FILES "${CMAKE_CURRENT_BINARY_DIR}/libsyncthinginternal.h" interface.cpp) diff --git a/syncthing/testfiles/testconfig b/syncthing/testfiles/testconfig deleted file mode 120000 index fbe1030..0000000 --- a/syncthing/testfiles/testconfig +++ /dev/null @@ -1 +0,0 @@ -../../connector/testfiles/testconfig \ No newline at end of file diff --git a/testhelper/CMakeLists.txt b/testhelper/CMakeLists.txt index fbdaa48..854bf1b 100644 --- a/testhelper/CMakeLists.txt +++ b/testhelper/CMakeLists.txt @@ -11,6 +11,9 @@ set(META_NO_CPP_UNIT ON) set(META_TEST_TARGET_IS_MANUAL ON) set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION OFF) +# use testfiles directory from syncthingconnector +set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector") + # add project files set(HEADER_FILES helper.h syncthingtestinstance.h) set(SRC_FILES helper.cpp syncthingtestinstance.cpp) diff --git a/testhelper/testfiles/testconfig b/testhelper/testfiles/testconfig deleted file mode 120000 index fbe1030..0000000 --- a/testhelper/testfiles/testconfig +++ /dev/null @@ -1 +0,0 @@ -../../connector/testfiles/testconfig \ No newline at end of file diff --git a/tray/CMakeLists.txt b/tray/CMakeLists.txt index 63536a7..31ebafe 100644 --- a/tray/CMakeLists.txt +++ b/tray/CMakeLists.txt @@ -6,6 +6,9 @@ set(META_APP_NAME "Syncthing Tray") set(META_APP_ACTIONS OPEN_WEBUI) set(META_APP_ACTION_OPEN_WEBUI "open-webui" "Open web UI" "--webui") +# use testfiles directory from syncthingconnector +set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector") + # add project files set(WIDGETS_HEADER_FILES application/singleinstance.h diff --git a/tray/testfiles/mocks b/tray/testfiles/mocks deleted file mode 120000 index 447706a..0000000 --- a/tray/testfiles/mocks +++ /dev/null @@ -1 +0,0 @@ -../../connector/testfiles/mocks \ No newline at end of file