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

[Andres Gomez]

The LD_LIBRARY_PATH environment variable could be already defined so
we extend it and restore it rather than just overwriting it.

v2:
 - Unset the __old_ld helper variable when we are done with it.
 - Corrected test for and escaping of variables (Eric).

Signed-off-by: Andres Gomez <ago...@igalia.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
---
 docs/releasing.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/releasing.html b/docs/releasing.html
index 85ab6ae8cb..47137f57e6 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/
+       test "x$LD_LIBRARY_PATH" != 'x' &amp;&amp; __old_ld="$LD_LIBRARY_PATH" 
&amp;&amp; __token=':'
+       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
+       test "x$__old_ld" != 'x' &amp;&amp; export LD_LIBRARY_PATH="$__old_ld" 
&amp;&amp; unset __old_ld &amp;&amp; unset __token
        unset LIBGL_DRIVERS_PATH
        unset LIBGL_DEBUG
        unset LIBGL_ALWAYS_SOFTWARE
-- 
2.13.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev