tests: Keep track of basename
basename returns the filename without path information (but with the file extension). We can get this more efficiently via shell variables. Also, for the socket name, use the test's name without the file extension. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: rebased without "tests: Support --config to enable tests to override config defaults".]
This commit is contained in:
parent
06c42747ec
commit
63b1ee9351
|
@ -1,8 +1,9 @@
|
|||
#!/bin/bash
|
||||
|
||||
TESTNAME=$1
|
||||
TEST_FILE=${1##*/}
|
||||
TEST_NAME=${TEST_FILE%.*}
|
||||
|
||||
if test -z "$TESTNAME"; then
|
||||
if test -z "$TEST_NAME"; then
|
||||
echo "usage: $(basename $0) <test name>"
|
||||
exit 1;
|
||||
fi
|
||||
|
@ -27,26 +28,26 @@ SHELL_PLUGIN=$MODDIR/desktop-shell.so
|
|||
TEST_PLUGIN=$MODDIR/weston-test.so
|
||||
XWAYLAND_PLUGIN=$MODDIR/xwayland.so
|
||||
|
||||
case $TESTNAME in
|
||||
case $TEST_FILE in
|
||||
*.la|*.so)
|
||||
WESTON_BUILD_DIR=$abs_builddir \
|
||||
$WESTON --backend=$MODDIR/$BACKEND \
|
||||
--no-config \
|
||||
--shell=$SHELL_PLUGIN \
|
||||
--socket=test-$(basename $TESTNAME) \
|
||||
--modules=$MODDIR/${TESTNAME/.la/.so},$XWAYLAND_PLUGIN \
|
||||
--socket=test-${TEST_NAME} \
|
||||
--modules=$MODDIR/${TEST_FILE/.la/.so},$XWAYLAND_PLUGIN \
|
||||
--log="$SERVERLOG" \
|
||||
&> "$OUTLOG"
|
||||
;;
|
||||
*)
|
||||
WESTON_BUILD_DIR=$abs_builddir \
|
||||
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TESTNAME $WESTON \
|
||||
--socket=test-$(basename $TESTNAME) \
|
||||
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
|
||||
--socket=test-${TEST_NAME} \
|
||||
--backend=$MODDIR/$BACKEND \
|
||||
--no-config \
|
||||
--shell=$SHELL_PLUGIN \
|
||||
--log="$SERVERLOG" \
|
||||
--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
|
||||
$($abs_builddir/$TESTNAME --params) \
|
||||
$($abs_builddir/$TEST_FILE --params) \
|
||||
&> "$OUTLOG"
|
||||
esac
|
||||
|
|
Loading…
Reference in New Issue