diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-05-07 16:26:27 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-05-09 15:00:14 -0700 |
| commit | 6ea0d176d667c908754756c6d8051f25d16e953c (patch) | |
| tree | 5e904c319e0455e31e2affb4450d56451c9dbf59 /tests | |
| parent | 412e58a240618873c499b1168d61e887270d6212 (diff) | |
| download | weston-6ea0d176d667c908754756c6d8051f25d16e953c.tar.gz | |
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 <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/weston-tests-env | 6 |
1 files 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 |