[Mesa-dev] [PATCH 3/4] docs: avoid overwrite of LD_LIBRARY_PATH during basic testing
Andres Gomez
agomez at igalia.com
Sat Jul 8 19:59:40 UTC 2017
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 <agomez at 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>&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/
+ 'x$LD_LIBRARY_PATH' -ne 'x' && __old_ld='$LD_LIBRARY_PATH' && __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
+ 'x$__old_ld' -ne 'x' && export LD_LIBRARY_PATH='$__old_ld' && unset __token
unset LIBGL_DRIVERS_PATH
unset LIBGL_DEBUG
unset LIBGL_ALWAYS_SOFTWARE
--
2.11.0
More information about the mesa-dev
mailing list