From: Andres Gomez Date: Sat, 8 Jul 2017 19:59:40 +0000 (+0300) Subject: docs: avoid overwrite of LD_LIBRARY_PATH during basic testing X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6f455646a526b200dd4845a43033ef31b281951;p=mesa.git docs: avoid overwrite of LD_LIBRARY_PATH during basic testing 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). v3: Remove unneeded variable (Emil). Signed-off-by: Andres Gomez Reviewed-by: Emil Velikov --- diff --git a/docs/releasing.html b/docs/releasing.html index 85ab6ae8cb1..1ef3fd89a13 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>&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/ + test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__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' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld unset LIBGL_DRIVERS_PATH unset LIBGL_DEBUG unset LIBGL_ALWAYS_SOFTWARE