tests: fix a race condition in ivi-shell tests
ivi-shell tests load their own controller plugin for testing purposes. Tests also uses the generated weston-ivi.in config file, which causes weston to load hmi-controller and its helper client. Existence of hmi-controller and its helper client confuses test plugins. Because they are creating surfaces and layers which are not expected by test plugins. We can start ivi-shell tests without config file to solve this problem. Then, weston will not load hmi-controller plugin. Reported-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Acked-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
parent
eba58edc6a
commit
c6e2942fab
16
Makefile.am
16
Makefile.am
@ -30,15 +30,6 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
|
|||||||
-e 's|@plugin_prefix[@]||g' \
|
-e 's|@plugin_prefix[@]||g' \
|
||||||
$< > $@
|
$< > $@
|
||||||
|
|
||||||
tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
|
|
||||||
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
|
|
||||||
-e 's|@bindir[@]|$(bindir)|g' \
|
|
||||||
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
|
|
||||||
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
|
|
||||||
-e 's|@libexecdir[@]|$(abs_builddir)|g' \
|
|
||||||
-e 's|@plugin_prefix[@]|$(abs_top_builddir)/.libs/|g' \
|
|
||||||
$< > $@
|
|
||||||
|
|
||||||
all-local : weston.ini ivi-shell/weston.ini
|
all-local : weston.ini ivi-shell/weston.ini
|
||||||
|
|
||||||
AM_CFLAGS = $(GCC_CFLAGS)
|
AM_CFLAGS = $(GCC_CFLAGS)
|
||||||
@ -56,7 +47,6 @@ AM_CPPFLAGS = \
|
|||||||
|
|
||||||
CLEANFILES = weston.ini \
|
CLEANFILES = weston.ini \
|
||||||
ivi-shell/weston.ini \
|
ivi-shell/weston.ini \
|
||||||
tests/weston-ivi.ini \
|
|
||||||
internal-screenshot-00.png \
|
internal-screenshot-00.png \
|
||||||
$(BUILT_SOURCES)
|
$(BUILT_SOURCES)
|
||||||
|
|
||||||
@ -1234,10 +1224,6 @@ weston_tests = \
|
|||||||
devices.weston \
|
devices.weston \
|
||||||
touch.weston
|
touch.weston
|
||||||
|
|
||||||
ivi_tests =
|
|
||||||
|
|
||||||
$(ivi_tests) : $(builddir)/tests/weston-ivi.ini
|
|
||||||
|
|
||||||
AM_TESTS_ENVIRONMENT = \
|
AM_TESTS_ENVIRONMENT = \
|
||||||
abs_builddir='$(abs_builddir)'; export abs_builddir; \
|
abs_builddir='$(abs_builddir)'; export abs_builddir; \
|
||||||
abs_top_srcdir='$(abs_top_srcdir)'; export abs_top_srcdir;
|
abs_top_srcdir='$(abs_top_srcdir)'; export abs_top_srcdir;
|
||||||
@ -1468,7 +1454,7 @@ nodist_ivi_layout_test_la_SOURCES = \
|
|||||||
protocol/weston-test-protocol.c \
|
protocol/weston-test-protocol.c \
|
||||||
protocol/weston-test-server-protocol.h
|
protocol/weston-test-server-protocol.h
|
||||||
|
|
||||||
ivi_tests += \
|
ivi_tests = \
|
||||||
ivi-shell-app.weston
|
ivi-shell-app.weston
|
||||||
|
|
||||||
ivi_shell_app_weston_SOURCES = tests/ivi-shell-app-test.c
|
ivi_shell_app_weston_SOURCES = tests/ivi-shell-app-test.c
|
||||||
|
@ -44,7 +44,7 @@ case $TEST_FILE in
|
|||||||
WESTON_BUILD_DIR=$abs_builddir \
|
WESTON_BUILD_DIR=$abs_builddir \
|
||||||
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
|
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
|
||||||
$WESTON --backend=$MODDIR/$BACKEND \
|
$WESTON --backend=$MODDIR/$BACKEND \
|
||||||
--config=$abs_builddir/tests/weston-ivi.ini \
|
--no-config \
|
||||||
--shell=$SHELL_PLUGIN \
|
--shell=$SHELL_PLUGIN \
|
||||||
--socket=test-${TEST_NAME} \
|
--socket=test-${TEST_NAME} \
|
||||||
--modules=$TEST_PLUGIN,$MODDIR/${TEST_FILE/.la/.so}\
|
--modules=$TEST_PLUGIN,$MODDIR/${TEST_FILE/.la/.so}\
|
||||||
@ -74,7 +74,7 @@ case $TEST_FILE in
|
|||||||
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
|
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
|
||||||
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
|
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
|
||||||
$WESTON --backend=$MODDIR/$BACKEND \
|
$WESTON --backend=$MODDIR/$BACKEND \
|
||||||
--config=$abs_builddir/tests/weston-ivi.ini \
|
--no-config \
|
||||||
--shell=$SHELL_PLUGIN \
|
--shell=$SHELL_PLUGIN \
|
||||||
--socket=test-${TEST_NAME} \
|
--socket=test-${TEST_NAME} \
|
||||||
--modules=$TEST_PLUGIN \
|
--modules=$TEST_PLUGIN \
|
||||||
|
Loading…
Reference in New Issue
Block a user