Mesa (master): docs: avoid overwrite of LD_LIBRARY_PATH during basic testing

[Andres Gomez]

Module: Mesa
Branch: master
Commit: e6f455646a526b200dd4845a43033ef31b281951
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6f455646a526b200dd4845a43033ef31b281951

Author: Andres Gomez <agomez at igalia.com>
Date:   Sat Jul  8 22:59:40 2017 +0300

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 <agomez at igalia.com>
Reviewed-by: Emil Velikov <emil.velikov at 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..1ef3fd89a1 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