From 82cbb82cb1f1fc7d4fd45d93edda27c41a3fc6ef Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Tue, 30 Apr 2024 21:37:54 +0300 Subject: [PATCH] fix test building --- sources/awesome-widget/plugin/awbugreporter.h | 2 +- .../awesome-widget/plugin/awconfighelper.h | 2 +- sources/awesome-widget/plugin/awkeys.h | 2 +- .../plugin/awpatternfunctions.h | 2 +- .../plugin/awtelemetryhandler.h | 2 +- .../awesome-widget/plugin/awupdatehelper.h | 2 +- sources/desktop-panel/plugin/dpadds.h | 2 +- sources/test/CMakeLists.txt | 78 +++++++++---------- sources/test/awtestlibrary.cpp | 1 - sources/test/testawbugreporter.cpp | 1 - 10 files changed, 43 insertions(+), 51 deletions(-) diff --git a/sources/awesome-widget/plugin/awbugreporter.h b/sources/awesome-widget/plugin/awbugreporter.h index 7f79321..e17f080 100644 --- a/sources/awesome-widget/plugin/awbugreporter.h +++ b/sources/awesome-widget/plugin/awbugreporter.h @@ -23,7 +23,7 @@ class QNetworkAccessManager; class QNetworkReply; -class AWBugReporter : public QObject +class __attribute__((visibility("default"))) AWBugReporter : public QObject { Q_OBJECT diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h index a4f16a5..9730292 100644 --- a/sources/awesome-widget/plugin/awconfighelper.h +++ b/sources/awesome-widget/plugin/awconfighelper.h @@ -23,7 +23,7 @@ class QSettings; -class AWConfigHelper : public QObject +class __attribute__((visibility("default"))) AWConfigHelper : public QObject { Q_OBJECT diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index 2a1322e..e7f137e 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -28,7 +28,7 @@ class AWKeyOperations; class AWKeysAggregator; class QTimer; -class AWKeys : public QObject +class __attribute__((visibility("default"))) AWKeys : public QObject { Q_OBJECT diff --git a/sources/awesome-widget/plugin/awpatternfunctions.h b/sources/awesome-widget/plugin/awpatternfunctions.h index 2d3f2a4..1b1a660 100644 --- a/sources/awesome-widget/plugin/awpatternfunctions.h +++ b/sources/awesome-widget/plugin/awpatternfunctions.h @@ -23,7 +23,7 @@ class AWKeysAggregator; -namespace AWPatternFunctions +namespace __attribute__((visibility("default"))) AWPatternFunctions { typedef struct { QStringList args; diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.h b/sources/awesome-widget/plugin/awtelemetryhandler.h index dd202d4..7c750fe 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.h +++ b/sources/awesome-widget/plugin/awtelemetryhandler.h @@ -20,7 +20,7 @@ #include -class AWTelemetryHandler : public QObject +class __attribute__((visibility("default"))) AWTelemetryHandler : public QObject { Q_OBJECT diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h index e5dba9d..be619e2 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.h +++ b/sources/awesome-widget/plugin/awupdatehelper.h @@ -24,7 +24,7 @@ class KNotification; class QNetworkReply; -class AWUpdateHelper : public QObject +class __attribute__((visibility("default"))) AWUpdateHelper : public QObject { Q_OBJECT diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h index eeddb17..c2d3a3e 100644 --- a/sources/desktop-panel/plugin/dpadds.h +++ b/sources/desktop-panel/plugin/dpadds.h @@ -28,7 +28,7 @@ class VirtualDesktopInfo; class WindowTasksModel; } // namespace TaskManager -class DPAdds : public QObject +class __attribute__((visibility("default"))) DPAdds : public QObject { Q_OBJECT diff --git a/sources/test/CMakeLists.txt b/sources/test/CMakeLists.txt index 3903a3a..a058f32 100644 --- a/sources/test/CMakeLists.txt +++ b/sources/test/CMakeLists.txt @@ -21,59 +21,53 @@ set(AWTESTLIBRARY_HEADERS awtestlibrary.h) set(AWTESTLIBRARY_SOURCES awtestlibrary.cpp) add_library(${SUBPROJECT}-awtest STATIC ${AWTESTLIBRARY_SOURCES} ${AWTESTLIBRARY_HEADERS}) target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt6Test_LIBRARIES} ${Kf6_LIBRARIES}) -set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES} +set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES} awplugin dpplugin ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt6Test_LIBRARIES}) # modules set(TEST_MODULES - abstractextitem extquotes extscript extupgrade extweather - abstractformatter datetimeformatter floatformatter jsonformatter listformatter noformatter scriptformatter stringformatter + abstractextitem + extquotes + extscript + extupgrade + extweather + + abstractformatter + datetimeformatter + floatformatter + jsonformatter + listformatter + noformatter + scriptformatter + stringformatter + extitemaggregator - batterysource desktopsource networksource playersource processessource - awbugreporter awconfighelper awkeycache awkeys awpatternfunctions awtelemetryhandler awupdatehelper - dpplugin) + + batterysource + desktopsource + networksource + playersource + processessource + + awbugreporter + awconfighelper + awkeycache + awkeys + awpatternfunctions + awtelemetryhandler + awupdatehelper + + dpplugin +) + foreach (TEST_MODULE ${TEST_MODULES}) set(${TEST_MODULE}_HEADERS test${TEST_MODULE}.h) set(${TEST_MODULE}_SOURCES test${TEST_MODULE}.cpp) - if (TEST_MODULE MATCHES "awbugreporter") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awbugreporter.cpp) - elseif (TEST_MODULE MATCHES "awconfighelper") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awconfighelper.cpp) - elseif (TEST_MODULE MATCHES "awkeycache") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awkeycache.cpp) - elseif (TEST_MODULE MATCHES "awkeys") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awabstractpairhelper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awactions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awcustomkeyshelper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awdataaggregator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awdataengineaggregator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awdataenginemapper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awdbusadaptor.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awformatterhelper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awkeycache.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awkeyoperations.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awkeys.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awkeysaggregator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awpatternfunctions.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awupdatehelper.cpp - ${PROJECT_TRDPARTY_DIR}/fontdialog/fontdialog.cpp) - elseif (TEST_MODULE MATCHES "awpatternfunctions") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awabstractpairhelper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awdataenginemapper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awformatterhelper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awkeysaggregator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awpatternfunctions.cpp) - elseif (TEST_MODULE MATCHES "awtelemetryhandler") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awtelemetryhandler.cpp) - elseif (TEST_MODULE MATCHES "awupdatehelper") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../awesome-widget/plugin/awupdatehelper.cpp) - elseif (TEST_MODULE MATCHES "dpplugin") - set(${TEST_MODULE}_SOURCES ${${TEST_MODULE}_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../desktop-panel/plugin/dpadds.cpp - ${PROJECT_TRDPARTY_DIR}/fontdialog/fontdialog.cpp) - endif (TEST_MODULE MATCHES "awbugreporter") add_executable(${SUBPROJECT}-${TEST_MODULE} ${${TEST_MODULE}_HEADERS} ${${TEST_MODULE}_SOURCES}) + target_link_libraries(${SUBPROJECT}-${TEST_MODULE} ${LIBRARY_TEST_SET}) set_target_properties(${SUBPROJECT}-${TEST_MODULE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + if (NOT TEST_MODULE MATCHES "awbugreporter") add_test(NAME ${TEST_MODULE} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT}-${TEST_MODULE}) endif (NOT TEST_MODULE MATCHES "awbugreporter") diff --git a/sources/test/awtestlibrary.cpp b/sources/test/awtestlibrary.cpp index f280511..c664fa3 100644 --- a/sources/test/awtestlibrary.cpp +++ b/sources/test/awtestlibrary.cpp @@ -15,7 +15,6 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - #include "awtestlibrary.h" #include diff --git a/sources/test/testawbugreporter.cpp b/sources/test/testawbugreporter.cpp index 4dc19f7..81dd576 100644 --- a/sources/test/testawbugreporter.cpp +++ b/sources/test/testawbugreporter.cpp @@ -15,7 +15,6 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - #include "testawbugreporter.h" #include