From 412e58a240618873c499b1168d61e887270d6212 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 7 May 2014 16:26:26 +0300 Subject: [PATCH] tests: use --no-config Use --no-config to avoid loading arbitrary weston.ini files from unit tests. It may affect the unit test results. I actually hit the following case: [13:34:04.636] Using config file '/home/pq/local/etc/weston.ini' [13:34:04.636] Loading module '/home/pq/git/weston/.libs/headless-backend.so' [13:34:04.637] launching '/home/pq/local/libexec/weston-keyboard' [13:34:04.644] Loading module '/home/pq/local/lib/weston/desktop-shell.so' [13:34:04.644] Loading module '/home/pq/local/lib/weston/xwayland.so' [13:34:04.648] unlinking stale lock file /tmp/.X1-lock [13:34:04.648] xserver listening on display :1 [13:34:04.648] Loading module '/home/pq/git/weston/.libs/./xwayland.so' [13:34:04.648] xserver listening on display :2 [13:34:04.648] Module '/home/pq/local/lib/weston/xwayland.so' already loaded Weston tries to load xwayland module three times, or which twice it succeeds. This might not make the xwayland test end well. Or at all, actually. Adding --no-config should remove one of these loads of xwayland.so. Signed-off-by: Pekka Paalanen --- tests/weston-tests-env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/weston-tests-env b/tests/weston-tests-env index 9180053..746ae27 100755 --- a/tests/weston-tests-env +++ b/tests/weston-tests-env @@ -26,6 +26,7 @@ BACKEND=$abs_builddir/.libs/$BACKEND case $TESTNAME in *.la|*.so) $WESTON --backend=$BACKEND \ + --no-config \ --socket=test-$(basename $TESTNAME) \ --modules=$abs_builddir/.libs/${TESTNAME/.la/.so},xwayland.so \ --log="$SERVERLOG" \ @@ -35,6 +36,7 @@ case $TESTNAME in WESTON_TEST_CLIENT_PATH=$abs_builddir/$TESTNAME $WESTON \ --socket=test-$(basename $TESTNAME) \ --backend=$BACKEND \ + --no-config \ --log="$SERVERLOG" \ --modules=$abs_builddir/.libs/weston-test.so,xwayland.so \ &> "$OUTLOG" -- 2.7.4