Merge branch 'master' into connection-pool

Author: nickmshelley

Makefile

@@ -1,6 +1,10 @@
 BUILD_TOOL = xcodebuild
 BUILD_SCHEME = SQLite Mac
-BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)"
+ifeq ($(BUILD_SCHEME),SQLite iOS)
+	BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -sdk iphonesimulator
+else
+	BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)"
+endif
 
 XCPRETTY := $(shell command -v xcpretty)
 SWIFTCOV := $(shell command -v swiftcov)

run-tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ev
 if [ -n "$BUILD_SCHEME" ]; then
-    make test
+    make test BUILD_SCHEME="$BUILD_SCHEME"
 elif [ -n "$VALIDATOR_SUBSPEC" ]; then
     cd CocoaPodsTests && make test
-fi 
+fi