summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-07 10:54:38 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-08 18:02:38 +0200
commit8e99ae44dd5bf72bc8bd844251e9d670095804ac (patch)
tree38ddbf84fea7c9385de25f981d298fec9a99166a /scripts
parentd0ac12309b470eb59690ece3f15773df73a127e1 (diff)
downloadqtlocation-mapboxgl-8e99ae44dd5bf72bc8bd844251e9d670095804ac.tar.gz
[build] Use mesa-13.0.0-glx in CI builds
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis_setup.sh8
-rw-r--r--scripts/valgrind.sup86
2 files changed, 92 insertions, 2 deletions
diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh
index 47df36788d..6c39b3f42c 100755
--- a/scripts/travis_setup.sh
+++ b/scripts/travis_setup.sh
@@ -46,10 +46,14 @@ if [ -f /etc/init.d/xvfb ] && [ ! -z "${RUN_XVFB}" ]; then
# Make sure we're connecting to xvfb
export DISPLAY=:99.0
+ CXX11ABI=""
+ if [ `scripts/check-cxx11abi.sh` = 'ON' ]; then
+ CXX11ABI="-cxx11abi"
+ fi
# Install and set up to load a more recent version of mesa
mapbox_time "install_mesa" \
- mason install mesa 11.2.2
- export LD_LIBRARY_PATH="`mason prefix mesa 11.2.2`/lib:${LD_LIBRARY_PATH:-}"
+ mason install mesa 13.0.0-glx${CXX11ABI}
+ export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-glx${CXX11ABI}`/lib:${LD_LIBRARY_PATH:-}"
fi
# Install and set up to load awscli
diff --git a/scripts/valgrind.sup b/scripts/valgrind.sup
index f21f54be54..ea3e3d635a 100644
--- a/scripts/valgrind.sup
+++ b/scripts/valgrind.sup
@@ -180,3 +180,89 @@
fun:draw_wide_line
...
}
+{
+ Ubuntu 14.04 - Travis + Qt5
+ Memcheck:Leak
+ ...
+ obj:*/libQt5Core.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + Qt5
+ Memcheck:Cond
+ ...
+ obj:*/libQt5Core.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + Qt5
+ Memcheck:Value8
+ ...
+ obj:*/libQt5Core.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + Qt5
+ Memcheck:Leak
+ ...
+ obj:*/libQt5Gui.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + Qt5
+ Memcheck:Cond
+ ...
+ obj:*/libQt5Gui.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + Qt5
+ Memcheck:Value8
+ ...
+ obj:*/libQt5Gui.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + mesa 13.0.0-glx
+ Memcheck:Cond
+ ...
+ obj:*/mesa/libGL.so.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + mesa 13.0.0-glx
+ Memcheck:Value8
+ ...
+ obj:*/mesa/libGL.so.*
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + mesa 13.0.0-glx
+ Memcheck:Cond
+ ...
+ fun:do_rasterize_bin
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + mesa 13.0.0-glx
+ Memcheck:Value8
+ ...
+ fun:do_rasterize_bin
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + mesa 13.0.0-glx
+ Memcheck:Cond
+ ...
+ fun:_ZN6mapbox10pixelmatchEPKhS1_mmPhdb
+ ...
+}
+{
+ Ubuntu 14.04 - Travis + mesa 13.0.0-glx
+ Memcheck:Param
+ write(buf)
+ ...
+ obj:*/libc-*
+ fun:_ZN4mbgl4util10write_fileERKSsS2_
+ ...
+}