summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
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