Once we convert *.la to *.so, we only care about *.so files
Signed-off-by: Bryce Harrington <[email protected]>
---
tests/weston-tests-env | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index f7ee27a..09fc3a3 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -24,10 +24,17 @@ fi
MODDIR=$abs_builddir/.libs
+client=
+TEST_MODULE=$MODDIR/${TEST_FILE/.la/.so}
SHELL_PLUGIN=$MODDIR/desktop-shell.so
-TEST_PLUGIN=$MODDIR/weston-test.so
XWAYLAND_PLUGIN=$MODDIR/xwayland.so
+if [[ ${TEST_MODULE} != *.so ]]; then
+ export WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE
+ client=$($WESTON_TEST_CLIENT_PATH --params)
+ TEST_MODULE=$MODDIR/weston-test.so
+fi
+
CONFIG_FILE="${TEST_NAME}.ini"
if [ -e "${abs_builddir}/${CONFIG_FILE}" ]; then
CONFIG="--config=${abs_builddir}/${CONFIG_FILE}"
@@ -37,17 +44,6 @@ else
CONFIG="--no-config"
fi
-case $TEST_FILE in
- *.la|*.so)
- TEST_MODULE=$MODDIR/${TEST_FILE/.la/.so}
- client=
- ;;
- *)
- export WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE
- TEST_MODULE=$TEST_PLUGIN
- client=$($WESTON_TEST_CLIENT_PATH --params)
-esac
-
export WESTON_BUILD_DIR=$abs_builddir
$WESTON \
--shell=$SHELL_PLUGIN \
--
1.9.1
_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
