Merge pull request #467 from jberkel/reinstate-scheme-default

nickmshelley · web-flow · commit 9e71e3091191 · 2016-07-11T10:41:56.000-06:00
Makefile: re-add scheme default
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 BUILD_TOOL = xcodebuild
+BUILD_SCHEME = SQLite Mac
 ifeq ($(BUILD_SCHEME),SQLite iOS)
 	BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -sdk iphonesimulator
 else
diff --git a/run-tests.sh b/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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`BUILD_TOOL = xcodebuild`
	`2`	`+BUILD_SCHEME = SQLite Mac`
`2`	`3`	`ifeq ($(BUILD_SCHEME),SQLite iOS)`
`3`	`4`	`BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -sdk iphonesimulator`
`4`	`5`	`else`