summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2016-07-04 14:34:48 +0200
committerQuentin Glidic <sardemff7+git@sardemff7.net>2017-01-17 18:25:01 +0100
commit6d3887baec12c3a2b833301907546fba8c1fb26d (patch)
treec7c4fee7423ca298d55ca2c0f85d193789f8fc28 /tests
parentda01c1d105e1eb72ede863495dd60552b504df05 (diff)
weston: Add a specific option to load XWayland
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/weston-tests-env7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index 8a6447e4..6da0696e 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -24,7 +24,6 @@ MODDIR=$abs_builddir/.libs
SHELL_PLUGIN=$MODDIR/desktop-shell.so
TEST_PLUGIN=$MODDIR/weston-test.so
-XWAYLAND_PLUGIN=$MODDIR/xwayland.so
CONFIG_FILE="${TEST_NAME}.ini"
@@ -60,7 +59,8 @@ case $TEST_FILE in
${CONFIG} \
--shell=$SHELL_PLUGIN \
--socket=test-${TEST_NAME} \
- --modules=$MODDIR/${TEST_FILE/.la/.so},$XWAYLAND_PLUGIN \
+ --xwayland \
+ --modules=$MODDIR/${TEST_FILE/.la/.so} \
--log="$SERVERLOG" \
&> "$OUTLOG"
;;
@@ -89,7 +89,8 @@ case $TEST_FILE in
${CONFIG} \
--shell=$SHELL_PLUGIN \
--socket=test-${TEST_NAME} \
- --modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
+ --xwayland \
+ --modules=$TEST_PLUGIN \
--log="$SERVERLOG" \
$($abs_builddir/$TEST_FILE --params) \
&> "$OUTLOG"