From 01468f35aa86bb1011d99893d6a56da575f2ab90 Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Tue, 22 Sep 2020 20:23:13 -0600 Subject: Fix windows ci tests because of differences in ecm logic on windows. According to https://api.kde.org/ecm/module/ECMGenerateDBusServiceFile.html the macro being tested works differently on windows. The path to the binary executable is removed on windows. --- tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in | 7 ++++++- .../windowsexpected/org.kde.kded5.service | 3 +++ .../windowsexpected/org.kde.kded5.withSystemD.renamed.service | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.service create mode 100644 tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.withSystemD.renamed.service (limited to 'tests') diff --git a/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in b/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in index c5fe51c9..b63757c1 100644 --- a/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in +++ b/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in @@ -1,4 +1,9 @@ -set(EXPECTED "@CMAKE_CURRENT_SOURCE_DIR@/expected") +if (WIN32) + set(EXPECTED "@CMAKE_CURRENT_SOURCE_DIR@/windowsexpected") +else () + set(EXPECTED "@CMAKE_CURRENT_SOURCE_DIR@/expected") +endif (WIN32) + set(ACTUAL "@CMAKE_INSTALL_PREFIX@") # Compares files in two directories, emits a fatal error if the top level files are different diff --git a/tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.service b/tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.service new file mode 100644 index 00000000..74318d3a --- /dev/null +++ b/tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.kde.kded5 +Exec=kded5 diff --git a/tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.withSystemD.renamed.service b/tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.withSystemD.renamed.service new file mode 100644 index 00000000..4f0edda1 --- /dev/null +++ b/tests/ECMGenerateDBusServiceFileTest/windowsexpected/org.kde.kded5.withSystemD.renamed.service @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.kde.kded5.withSystemD +Exec=kded5 +SystemdService=plasma-kded.service -- cgit v1.2.1