From 6ea0d176d667c908754756c6d8051f25d16e953c Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 7 May 2014 16:26:27 +0300 Subject: [PATCH] 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 --- tests/weston-tests-env | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/weston-tests-env b/tests/weston-tests-env index 746ae27e..fb9928a8 100755 --- a/tests/weston-tests-env +++ b/tests/weston-tests-env @@ -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