[Mesa-dev] [PATCH 2/6] docs/releasing: tweak the glxinfo/glxgear/etc. command lines

[Eric Engestrom]

On Monday, 2017-02-13 13:42:19 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Print only the information needed. Namely:
> *info: the DRI module picked and the vendor/renderer strings
> *gears: everything but the "...configuration file..." line(s)
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  docs/releasing.html | 28 ++++++++++++++++------------
>  1 file changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/docs/releasing.html b/docs/releasing.html
> index ec1baee094..8ca1a563b4 100644
> --- a/docs/releasing.html
> +++ b/docs/releasing.html
> @@ -366,24 +366,28 @@ Here is one solution that I've been using.
>  		--enable-egl \
>  		--with-egl-platforms=x11,drm,wayland
>  	make -j2 && DESTDIR=`pwd`/test make -j6 install
> +	__glxinfo_cmd='glxinfo |& egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
> +	__glxgears_cmd='glxgears |& grep -v "configuration file"'
> +	__es2info_cmd='es2_info |& egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
> +	__es2gears_cmd='es2gears_x11 |& grep -v "configuration file"'

`|&` is a bash 4.0+ feature. I'd stick with `2>&1 |`. There's no reason
to restrict ourselves to this specific shell either (even though it is
the most popular).

Also, s/&/&/ :)
We might want to convert the rest of the docs to drop this old html
syntax at some point, but until then let's keep it consistent.
(Also, a rework of the whole website is coming, so it's probably not
worth it to change it all now)

>  	export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/
>  	export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
>  	export LIBGL_DEBUG=verbose
> -	glxinfo | egrep -o "Mesa.*"
> -	glxgears
> -	es2_info | egrep "GL_VERSION|GL_RENDERER"
> -	es2gears_x11
> +	eval $__glxinfo_cmd
> +	eval $__glxgears_cmd
> +	eval $__es2info_cmd
> +	eval $__es2gears_cmd
>  	export LIBGL_ALWAYS_SOFTWARE=1
> -	glxinfo | egrep -o "Mesa.*|Gallium.*"
> -	glxgears
> -	es2_info | egrep "GL_VERSION|GL_RENDERER"
> -	es2gears_x11
> +	eval $__glxinfo_cmd
> +	eval $__glxgears_cmd
> +	eval $__es2info_cmd
> +	eval $__es2gears_cmd
>  	export LIBGL_ALWAYS_SOFTWARE=1
>  	export GALLIUM_DRIVER=softpipe
> -	glxinfo | egrep -o "Mesa.*|Gallium.*"
> -	glxgears
> -	es2_info | egrep "GL_VERSION|GL_RENDERER"
> -	es2gears_x11
> +	eval $__glxinfo_cmd
> +	eval $__glxgears_cmd
> +	eval $__es2info_cmd
> +	eval $__es2gears_cmd
>  	# Smoke test DOTA2
>  	unset LD_LIBRARY_PATH
>  	unset LIBGL_DRIVERS_PATH
> -- 
> 2.11.0
>