docs/releasing: tweak the glxinfo/glxgear/etc. command lines

Print only the information needed. Namely:
*info: the DRI module picked and the vendor/renderer strings
*gears: everything but the "...configuration file..." line(s)

v2: (Eric) Use "2>&1 |" over "|&", properly escape &.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/docs/releasing.html b/docs/releasing.html
index ec1baee0943cdd5158ef687e8b3fbbe622906ad2..1bf88474f355a00aa2eba7a199216a7ec8b37ac4 100644 (file)
--- 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 2>&1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
+       __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"'
+       __es2info_cmd='es2_info 2>&1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
+       __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
        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