tests: load the right shell plugin
Again, load the shell plugin with full path, rather than possibly find an old version from a previous installation. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
committed by
Kristian Høgsberg
parent
6ea0d176d6
commit
c2b74fb849
@@ -22,6 +22,7 @@ if test -z "$BACKEND"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
BACKEND=$abs_builddir/.libs/$BACKEND
|
BACKEND=$abs_builddir/.libs/$BACKEND
|
||||||
|
SHELL_PLUGIN=$abs_builddir/.libs/desktop-shell.so
|
||||||
TEST_PLUGIN=$abs_builddir/.libs/weston-test.so
|
TEST_PLUGIN=$abs_builddir/.libs/weston-test.so
|
||||||
XWAYLAND_PLUGIN=$abs_builddir/.libs/xwayland.so
|
XWAYLAND_PLUGIN=$abs_builddir/.libs/xwayland.so
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ case $TESTNAME in
|
|||||||
*.la|*.so)
|
*.la|*.so)
|
||||||
$WESTON --backend=$BACKEND \
|
$WESTON --backend=$BACKEND \
|
||||||
--no-config \
|
--no-config \
|
||||||
|
--shell=$SHELL_PLUGIN \
|
||||||
--socket=test-$(basename $TESTNAME) \
|
--socket=test-$(basename $TESTNAME) \
|
||||||
--modules=$abs_builddir/.libs/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
|
--modules=$abs_builddir/.libs/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
|
||||||
--log="$SERVERLOG" \
|
--log="$SERVERLOG" \
|
||||||
@@ -39,6 +41,7 @@ case $TESTNAME in
|
|||||||
--socket=test-$(basename $TESTNAME) \
|
--socket=test-$(basename $TESTNAME) \
|
||||||
--backend=$BACKEND \
|
--backend=$BACKEND \
|
||||||
--no-config \
|
--no-config \
|
||||||
|
--shell=$SHELL_PLUGIN \
|
||||||
--log="$SERVERLOG" \
|
--log="$SERVERLOG" \
|
||||||
--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
|
--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
|
||||||
&> "$OUTLOG"
|
&> "$OUTLOG"
|
||||||
|
|||||||
Reference in New Issue
Block a user