tests: use MODDIR in weston-tests-env
Make a little short-hand for the module directory.
This also cleans up the redefinition of BACKEND in the script.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index aaf3ee1..4d9ba88 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -21,19 +21,20 @@
BACKEND=headless-backend.so
fi
-BACKEND=$abs_builddir/.libs/$BACKEND
-SHELL_PLUGIN=$abs_builddir/.libs/desktop-shell.so
-TEST_PLUGIN=$abs_builddir/.libs/weston-test.so
-XWAYLAND_PLUGIN=$abs_builddir/.libs/xwayland.so
+MODDIR=$abs_builddir/.libs
+
+SHELL_PLUGIN=$MODDIR/desktop-shell.so
+TEST_PLUGIN=$MODDIR/weston-test.so
+XWAYLAND_PLUGIN=$MODDIR/xwayland.so
case $TESTNAME in
*.la|*.so)
WESTON_BUILD_DIR=$abs_builddir \
- $WESTON --backend=$BACKEND \
+ $WESTON --backend=$MODDIR/$BACKEND \
--no-config \
--shell=$SHELL_PLUGIN \
--socket=test-$(basename $TESTNAME) \
- --modules=$abs_builddir/.libs/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
+ --modules=$MODDIR/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
--log="$SERVERLOG" \
&> "$OUTLOG"
;;
@@ -41,7 +42,7 @@
WESTON_BUILD_DIR=$abs_builddir \
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TESTNAME $WESTON \
--socket=test-$(basename $TESTNAME) \
- --backend=$BACKEND \
+ --backend=$MODDIR/$BACKEND \
--no-config \
--shell=$SHELL_PLUGIN \
--log="$SERVERLOG" \