summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-06-16 17:24:09 +0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2016-06-21 19:12:32 +0200
commit7ea0a0db32300cac63775501bd92bb884ef550c4 (patch)
tree3412f4da96ba0859a942a38fd8c1fccc4170c3c0 /Makefile
parentddc6bc330f4d92cf400e8c0b8c914f659884ecb6 (diff)
downloadqtlocation-mapboxgl-7ea0a0db32300cac63775501bd92bb884ef550c4.tar.gz
[tests] Run memory tests on travis
Qt4 will run tests with libjemalloc.so. The Memory.Footprint and the Memory.Fragmentation will only run with libjemalloc.so because we have then a better control over the results.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1e4ece1055..b3dd7c7d90 100644
--- a/Makefile
+++ b/Makefile
@@ -253,9 +253,11 @@ qt-app: $(QT_MAKEFILE)
qt-qml-app: $(QT_MAKEFILE)
$(QT_ENV) $(MAKE) -j$(JOBS) -C $(QT_OUTPUT_PATH) qt-qml-app
-test-qt: $(QT_MAKEFILE) node_modules
+test-qt-%: $(QT_MAKEFILE) node_modules
$(QT_ENV) $(MAKE) -j$(JOBS) -C $(QT_OUTPUT_PATH) test
- $(GDB) $(QT_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=*
+ $(GDB) $(QT_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=$*
+
+test-qt: test-qt-*
run-qt-app: qt-app
cd $(QT_OUTPUT_PATH)/$(BUILDTYPE) && ./qmapboxgl
@@ -263,10 +265,12 @@ run-qt-app: qt-app
run-qt-qml-app: qt-qml-app
cd $(QT_OUTPUT_PATH)/$(BUILDTYPE) && ./qquickmapboxgl
-test-valgrind-qt: $(QT_MAKEFILE) node_modules
+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
+ ./scripts/valgrind.sh $(QT_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=$*
+
+test-valgrind-qt: test-valgrind-qt-*
run-valgrind-qt-app: qt-app
.mason/mason install valgrind latest