[PATCH weston] tests: cleanup test runner script.

[Pekka Paalanen]

On Tue, 16 Feb 2016 21:55:06 -0800
Bryce Harrington <bryce at osg.samsung.com> wrote:

> On Mon, Dec 21, 2015 at 01:38:51PM -0800, Jon A. Cruz wrote:
> > Cleaned up test runner script to unify sections launching weston.
> > This makes the sections more legible and differences easier to spot.
> > 
> > Signed-off-by: Jon A. Cruz <jonc at osg.samsung.com>  
> 
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

Pushed:
   35552aa..c25f72d  master -> master


Thanks,
pq

> > ---
> >  tests/weston-tests-env | 20 ++++++++++----------
> >  1 file changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/tests/weston-tests-env b/tests/weston-tests-env
> > index 0b9ff1e..ab2d6c0 100755
> > --- a/tests/weston-tests-env
> > +++ b/tests/weston-tests-env
> > @@ -55,11 +55,11 @@ case $TEST_FILE in
> >  		WESTON_BUILD_DIR=$abs_builddir \
> >  		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
> >  		$WESTON --backend=$MODDIR/$BACKEND \
> > +			${CONFIG} \
> >  			--shell=$SHELL_PLUGIN \
> >  			--socket=test-${TEST_NAME} \
> >  			--modules=$MODDIR/${TEST_FILE/.la/.so},$XWAYLAND_PLUGIN \
> >  			--log="$SERVERLOG" \
> > -			${CONFIG} \  
> >  			&> "$OUTLOG"  
> >  		;;
> >  	ivi-*.weston)
> > @@ -67,26 +67,26 @@ case $TEST_FILE in
> >  
> >  		WESTON_BUILD_DIR=$abs_builddir \
> >  		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
> > -		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
> > -			--socket=test-${TEST_NAME} \
> > -			--backend=$MODDIR/$BACKEND \
> > +		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
> > +		$WESTON --backend=$MODDIR/$BACKEND \
> >  			--config=$abs_builddir/tests/weston-ivi.ini \
> >  			--shell=$SHELL_PLUGIN \
> > -			--log="$SERVERLOG" \
> > +			--socket=test-${TEST_NAME} \
> >  			--modules=$TEST_PLUGIN \
> > +			--log="$SERVERLOG" \
> >  			$($abs_builddir/$TESTNAME --params) \  
> >  			&> "$OUTLOG"  
> >  		;;
> >  	*)
> >  		WESTON_BUILD_DIR=$abs_builddir \
> >  		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
> > -		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
> > -			--socket=test-${TEST_NAME} \
> > -			--backend=$MODDIR/$BACKEND \
> > +		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
> > +		$WESTON --backend=$MODDIR/$BACKEND \
> > +			${CONFIG} \
> >  			--shell=$SHELL_PLUGIN \
> > -			--log="$SERVERLOG" \
> > +			--socket=test-${TEST_NAME} \
> >  			--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
> > -			${CONFIG} \
> > +			--log="$SERVERLOG" \
> >  			$($abs_builddir/$TEST_FILE --params) \  
> >  			&> "$OUTLOG"  
> >  esac
> > -- 
> > 2.5.0
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/wayland-devel  
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20160223/6e0c8c12/attachment.sig>