diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-16 19:22:29 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-16 19:30:20 +0300 |
| commit | 3f024ebaf02e82e9282e303a46127f366a84904d (patch) | |
| tree | 00b83040974508d4e22f3c7f87c81d028b289cdc | |
| parent | d323f393ec250fdc35efd7c79606e547526344fe (diff) | |
| download | qtlocation-mapboxgl-3f024ebaf02e82e9282e303a46127f366a84904d.tar.gz | |
[Qt] Install valgrind on-demand
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 2 |
3 files changed, 2 insertions, 3 deletions
@@ -242,9 +242,11 @@ run-qt-qml-app: qt-qml-app test-valgrind-qt: $(QT_MAKEFILE) node_modules $(QT_ENV) $(MAKE) -j$(JOBS) -C $(QT_OUTPUT_PATH) test + .mason/mason install valgrind latest ./scripts/valgrind.sh $(QT_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=-*.Load run-valgrind-qt-app: qt-app + .mason/mason install valgrind latest ./scripts/valgrind.sh $(QT_OUTPUT_PATH)/$(BUILDTYPE)/qmapboxgl --test -platform offscreen #### Linux targets ##################################################### @@ -127,7 +127,6 @@ print_flags webp static_libs cflags ldflags print_flags jni.hpp cflags print_flags earcut cflags print_flags benchmark static_libs cflags ldflags -print_flags valgrind CONFIG+=" } } diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 5f31c853d2..4b855f7c58 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -28,8 +28,6 @@ if [ "$MASON_PLATFORM" == "osx" ]; then CONFIG+=" 'opengl_ldflags%': ['-framework OpenGL', '-framework CoreFoundation'],"$LN } else - VALGRIND_VERSION=latest - function print_opengl_flags { CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN CONFIG+=" 'opengl_ldflags%': $(quote_flags $(pkg-config gl x11 --libs)),"$LN |