commit c2b74fb849930d4d845c4dc984a53abccd154148
author Pekka Paalanen <pekka.paalanen@collabora.co.uk> Wed May 07 16:26:28 2014 +0300
committer Kristian Høgsberg <krh@bitplanet.net> Fri May 09 15:00:32 2014 -0700
tree 61cf1843ffcd91dbb074eac698bebccf6e6e7a83
parent 6ea0d176d667c908754756c6d8051f25d16e953c

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>

tests/weston-tests-env

diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index fb9928a..473e092 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -22,6 +22,7 @@
 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
 
@@ -29,6 +30,7 @@
 	*.la|*.so)
 		$WESTON --backend=$BACKEND \
 			--no-config \
+			--shell=$SHELL_PLUGIN \
 			--socket=test-$(basename $TESTNAME) \
 			--modules=$abs_builddir/.libs/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
 			--log="$SERVERLOG" \
@@ -39,6 +41,7 @@
 			--socket=test-$(basename $TESTNAME) \
 			--backend=$BACKEND \
 			--no-config \
+			--shell=$SHELL_PLUGIN \
 			--log="$SERVERLOG" \
 			--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
 			&> "$OUTLOG"