Re: [Mesa-dev] [PATCH 3/4] docs: avoid overwrite of LD_LIBRARY_PATH during basic testing

[Eric Engestrom]

On Saturday, 2017-07-08 22:59:40 +0300, Andres Gomez wrote:
> The LD_LIBRARY_PATH environment variable could be already defined so
> we extend it and restore it rather than just overwriting it.
> 
> Signed-off-by: Andres Gomez <ago...@igalia.com>
> ---
>  docs/releasing.html | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/releasing.html b/docs/releasing.html
> index 8e6e4d1a6d..99235d8412 100644
> --- a/docs/releasing.html
> +++ b/docs/releasing.html
> @@ -472,7 +472,8 @@ Here is one solution that I've been using.
>       __glxgears_cmd='glxgears 2>&amp;1 | grep -v "configuration file"'
>       __es2info_cmd='es2_info 2>&amp;1 | egrep 
> "GL_VERSION|GL_RENDERER|.*dri\.so"'
>       __es2gears_cmd='es2gears_x11 2>&amp;1 | grep -v "configuration file"'
> -     export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/
> +     'x$LD_LIBRARY_PATH' -ne 'x' &amp;&amp; __old_ld='$LD_LIBRARY_PATH' 
> &amp;&amp; __token=':'

s/'/"/g across the patch

and you need `[ ]` around the tests

> +     export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/'${__token}${__old_ld}'
>       export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
>       export LIBGL_DEBUG=verbose
>       eval $__glxinfo_cmd
> @@ -492,6 +493,7 @@ Here is one solution that I've been using.
>       eval $__es2gears_cmd
>       # Smoke test DOTA2
>       unset LD_LIBRARY_PATH
> +     'x$__old_ld' -ne 'x' &amp;&amp; export LD_LIBRARY_PATH='$__old_ld' 
> &amp;&amp; unset __token
>       unset LIBGL_DRIVERS_PATH
>       unset LIBGL_DEBUG
>       unset LIBGL_ALWAYS_SOFTWARE
> -- 
> 2.11.0
> 
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev