summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@users.noreply.github.com>2015-04-23 18:21:57 -0700
committerJustin R. Miller <incanus@users.noreply.github.com>2015-04-23 18:21:57 -0700
commit8d766135974110a8c52a43956ff4f3313cb0e310 (patch)
treef7f585c1e3795f3746e8cafc76a4cf3ab933e788 /Makefile
parent75980a8905b9130ef7a87eb65c66c8a98437c081 (diff)
parentb528d7cc039f2a0abbf1eb6c77a7fc2099bc3a19 (diff)
downloadqtlocation-mapboxgl-8d766135974110a8c52a43956ff4f3313cb0e310.tar.gz
Merge pull request #1168 from mapbox/ios-testing
fixes #830, #880: bring back iOS tests; split OS X & iOS tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 14f78ed0f2..d0cf4407cd 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,9 @@ styles/styles:
SMCalloutView:
git submodule update --init platform/ios/vendor/SMCalloutView
+KIF:
+ git submodule update --init test/ios/KIF
+
#### Library builds ############################################################
.PRECIOUS: Makefile/mbgl
@@ -129,6 +132,9 @@ isim: Xcode/ios
ipackage: clean Xcode/ios
./scripts/package_ios.sh
+itest: ipackage KIF
+ ./scripts/test_ios.sh
+
# Legacy name
iproj: ios-proj