Differential D16682

Fix test of scriptedeffectsloader when run from build directory without install
ClosedPublic
Actions

Authored by graesslin on Nov 5 2018, 1:12 PM.

Details

Reviewers

zzag

Group Reviewers

KWin

Commits

R108:c36f9d29806d: Fix test of scriptedeffectsloader when run from build directory without install

Summary

On build.kde.org all tests loading scripted effects are failing. This
seems to be because the effects are not installed.

To make this work, this change introduces the following changes:

scripted effects are copied to ${build}/bin, like all binaries
the test sets XDG_DATA_DIRS env variable to point to ${build}/bin

This change also needs to be added to further tests once this is
accepted. Furthermore it could be considered whether KPackageLoader
should consider the QCoreApplication::applicationDirPath in addition to
the GenericDataLocation. This would make KPackageLoader work much better
in a build tree only setup.

Test Plan

Test passes locally, obviously not tried on build.kde.org

Diff Detail

Repository

R108 KWin

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

graesslin created this revision.Nov 5 2018, 1:12 PM

Restricted Application added a project: KWin. · View Herald TranscriptNov 5 2018, 1:12 PM

Restricted Application added a subscriber: kwin. · View Herald Transcript

graesslin requested review of this revision.Nov 5 2018, 1:12 PM

Harbormaster completed remote builds in B4586: Diff 44900.Nov 5 2018, 1:12 PM

graesslin mentioned this in T9988: KWin cannot find it's effects in autotests.Nov 5 2018, 1:12 PM

I wrecked my local installation, testScriptedEffectLoaded is now passes without running make install.

Could we maybe btw introduce add_scripted_effect function or something like that so we don't have to duplicate

install(...)
install(...)
install(...)
file(...)

This revision is now accepted and ready to land.Nov 5 2018, 2:35 PM

In D16682#354502, @zzag wrote:
I wrecked my local installation, testScriptedEffectLoaded is now passes without running make install.

Could we maybe btw introduce add_scripted_effect function or something like that so we don't have to duplicate
install(...)
install(...)
install(...)
file(...)
?

Yep, makes sense to have a shortcut for it.

Closed by commit R108:c36f9d29806d: Fix test of scriptedeffectsloader when run from build directory without install (authored by graesslin). · Explain WhyNov 7 2018, 8:35 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			autotests/test_scripted_effectloader.cpp (1 line)
M			effects/dialogparent/package/CMakeLists.txt (2 lines)
M			effects/eyeonscreen/package/CMakeLists.txt (2 lines)
M			effects/fade/CMakeLists.txt (2 lines)
M			effects/fadedesktop/CMakeLists.txt (2 lines)
M			effects/frozenapp/package/CMakeLists.txt (2 lines)
M			effects/login/package/CMakeLists.txt (2 lines)
M			effects/logout/package/CMakeLists.txt (2 lines)
M			effects/maximize/package/CMakeLists.txt (2 lines)
M			effects/scale/package/CMakeLists.txt (2 lines)
M			effects/squash/package/CMakeLists.txt (2 lines)
M			effects/translucency/package/CMakeLists.txt (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	44900	456cbb9		Nov 5 2018, 1:12 PM	★	★
Diff 2	45008	a04b9da	R108:c36f9d29806da291e849a6784d436439bc14455d	Nov 7 2018, 8:34 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
f1bae504f562	54fd5413be43	456cbb9bf73c	Martin Flöser	Fix test of scriptedeffectsloader when run from build directory without install (Show More…)	Nov 5 2018, 1:08 PM