[PATCH weston 2/4] tests: Set WESTON_DATA_DIR for tests

Derek Foreman derekf at osg.samsung.com
Tue Feb 6 21:18:37 UTC 2018


Set the env var to override the system data directory so we can run
tests with uninstalled icons.

We don't yet use the code that checks this env var, so make distcheck
will still fail.

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 tests/weston-tests-env | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index 6da0696e..f62b70ec 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -40,6 +40,7 @@ case $TEST_FILE in
 		SHELL_PLUGIN=$MODDIR/ivi-shell.so
 
 		set -x
+		WESTON_DATA_DIR=$abs_top_srcdir/data \
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
 		$WESTON --backend=$MODDIR/$BACKEND \
@@ -53,6 +54,7 @@ case $TEST_FILE in
 		;;
 	*.la|*.so)
 		set -x
+		WESTON_DATA_DIR=$abs_top_srcdir/data \
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
 		$WESTON --backend=$MODDIR/$BACKEND \
@@ -68,6 +70,7 @@ case $TEST_FILE in
 		SHELL_PLUGIN=$MODDIR/ivi-shell.so
 
 		set -x
+		WESTON_DATA_DIR=$abs_top_srcdir/data \
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
 		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
@@ -82,6 +85,7 @@ case $TEST_FILE in
 		;;
 	*)
 		set -x
+		WESTON_DATA_DIR=$abs_top_srcdir/data \
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
 		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
-- 
2.14.3



More information about the wayland-devel mailing list