[PATCH 3/5] tests: Keep track of basename

[Pekka Paalanen]

On Wed,  1 Apr 2015 19:17:05 -0700
Bryce Harrington <bryce at osg.samsung.com> wrote:

> 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.
> 
> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> ---
>  tests/weston-tests-env | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/weston-tests-env b/tests/weston-tests-env
> index 070c686..02c89b4 100755
> --- a/tests/weston-tests-env
> +++ b/tests/weston-tests-env
> @@ -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,33 +28,33 @@ SHELL_PLUGIN=$MODDIR/desktop-shell.so
>  TEST_PLUGIN=$MODDIR/weston-test.so
>  XWAYLAND_PLUGIN=$MODDIR/xwayland.so
>  
> -CONFIG_FILE="$abs_builddir/$(basename $TESTNAME).ini"
> +CONFIG_FILE="$abs_builddir/${TEST_NAME}.ini"
>  if [ -e "${CONFIG_FILE}" ]; then
>  	CONFIG="--config=${CONFIG_FILE}"
>  else
>  	CONFIG="--no-config"
>  fi
>  
> -case $TESTNAME in
> +case $TEST_FILE in
>  	*.la|*.so)
>  		WESTON_BUILD_DIR=$abs_builddir \
>  		$WESTON --backend=$MODDIR/$BACKEND \
>  			$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 \
>  			$CONFIG \
>  			--shell=$SHELL_PLUGIN \
>  			--log="$SERVERLOG" \
>  			--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
> -			$($abs_builddir/$TESTNAME --params) \
> +			$($abs_builddir/$TEST_FILE --params) \
>  			&> "$OUTLOG"
>  esac

Looks like a nice clean-up.

Another thing we could do is to do the .la -> .so substitution
beforehand, so the *.la|*.so) and ${TEST_FILE/.la/.so} could be
simplified.

Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>


Thanks,
pq