mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-10-16 01:02:20 +00:00
tests: load the right xwayland plugin
If we do not specify the full path to xwayland.so, Weston can find an old one installed in a $prefix and use that instead of the freshly built one. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
parent
412e58a240
commit
6ea0d176d6
|
@ -22,13 +22,15 @@ if test -z "$BACKEND"; then
|
|||
fi
|
||||
|
||||
BACKEND=$abs_builddir/.libs/$BACKEND
|
||||
TEST_PLUGIN=$abs_builddir/.libs/weston-test.so
|
||||
XWAYLAND_PLUGIN=$abs_builddir/.libs/xwayland.so
|
||||
|
||||
case $TESTNAME in
|
||||
*.la|*.so)
|
||||
$WESTON --backend=$BACKEND \
|
||||
--no-config \
|
||||
--socket=test-$(basename $TESTNAME) \
|
||||
--modules=$abs_builddir/.libs/${TESTNAME/.la/.so},xwayland.so \
|
||||
--modules=$abs_builddir/.libs/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
|
||||
--log="$SERVERLOG" \
|
||||
&> "$OUTLOG"
|
||||
;;
|
||||
|
@ -38,6 +40,6 @@ case $TESTNAME in
|
|||
--backend=$BACKEND \
|
||||
--no-config \
|
||||
--log="$SERVERLOG" \
|
||||
--modules=$abs_builddir/.libs/weston-test.so,xwayland.so \
|
||||
--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
|
||||
&> "$OUTLOG"
|
||||
esac
|
||||
|
|
Loading…
Reference in a new issue