diff options
| author | Jeremy Whiting <jeremy.whiting@collabora.com> | 2020-09-22 20:23:13 -0600 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2020-09-26 11:01:17 +0000 |
| commit | 01468f35aa86bb1011d99893d6a56da575f2ab90 (patch) | |
| tree | 66afea5a59e3028f80445594d7cbf2aa9c21298a /tests | |
| parent | 7e73f1a972f13699c3c2cb80ad50c834b8a8464e (diff) | |
| download | extra-cmake-modules-01468f35aa86bb1011d99893d6a56da575f2ab90.tar.gz extra-cmake-modules-01468f35aa86bb1011d99893d6a56da575f2ab90.tar.bz2 | |
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.
Diffstat (limited to 'tests')
3 files changed, 13 insertions, 1 deletions
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 |