summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xconfigure1
-rw-r--r--platform/qt/scripts/configure.sh2
3 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6e682731e6..24747f8071 100644
--- a/Makefile
+++ b/Makefile
@@ -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 #####################################################
diff --git a/configure b/configure
index 6b9a3b63cc..3c90c5ebbe 100755
--- a/configure
+++ b/configure
@@ -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