@ -21,19 +21,20 @@ if test -z "$BACKEND"; then
BACKEND=headless-backend.so
BACKEND=headless-backend.so
fi
fi
BACKEND=$abs_builddir/.libs/$BACKEND
MODDIR=$abs_builddir/.libs
SHELL_PLUGIN=$abs_builddir/.libs/desktop-shell.so
TEST_PLUGIN=$abs_builddir/.libs/weston-test.so
SHELL_PLUGIN=$MODDIR/desktop-shell.so
XWAYLAND_PLUGIN=$abs_builddir/.libs/xwayland.so
TEST_PLUGIN=$MODDIR/weston-test.so
XWAYLAND_PLUGIN=$MODDIR/xwayland.so
case $TESTNAME in
case $TESTNAME in
*.la|*.so)
*.la|*.so)
WESTON_BUILD_DIR=$abs_builddir \
WESTON_BUILD_DIR=$abs_builddir \
$WESTON --backend=$BACKEND \
$WESTON --backend=$MODDIR/$ BACKEND \
--no-config \
--no-config \
--shell=$SHELL_PLUGIN \
--shell=$SHELL_PLUGIN \
--socket=test-$(basename $TESTNAME) \
--socket=test-$(basename $TESTNAME) \
--modules=$abs_builddir/.libs /${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
--modules=$MODDIR /${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
--log="$SERVERLOG" \
--log="$SERVERLOG" \
&> "$OUTLOG"
&> "$OUTLOG"
;;
;;
@ -41,7 +42,7 @@ case $TESTNAME in
WESTON_BUILD_DIR=$abs_builddir \
WESTON_BUILD_DIR=$abs_builddir \
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TESTNAME $WESTON \
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TESTNAME $WESTON \
--socket=test-$(basename $TESTNAME) \
--socket=test-$(basename $TESTNAME) \
--backend=$BACKEND \
--backend=$MODDIR/$ BACKEND \
--no-config \
--no-config \
--shell=$SHELL_PLUGIN \
--shell=$SHELL_PLUGIN \
--log="$SERVERLOG" \
--log="$SERVERLOG" \