summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-01-21 19:30:58 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-02-04 10:49:05 +0100
commit8a1fce547e9ad0bf750418c844c9b23a3ee6d8dd (patch)
treee3f0e8f4b16071667c6a4fdf706740335500dbc6 /Makefile
parent5503aef6907b1fea74d6bdbe696f02b9f016f752 (diff)
downloadqtlocation-mapboxgl-8a1fce547e9ad0bf750418c844c9b23a3ee6d8dd.tar.gz
rearrange tests and add storage tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7d2fd5e6f4..db9f7df07e 100644
--- a/Makefile
+++ b/Makefile
@@ -105,10 +105,12 @@ android:
test: build/test/Makefile
$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
+ ./scripts/run_tests.sh
-test_%: build/test/Makefile
- $(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) $*
- (cd build/$(BUILDTYPE) && exec ./test_$*)
+
+test-%: build/test/Makefile
+ $(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
+ build/$(BUILDTYPE)/test --gtest_filter=$*
# build Mac OS X project for Xcode
xtest: build/test/test.xcodeproj