Refactor make targets for Travis

Author: michaelklishin

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
 osx_image: xcode10.1
 xcode_project: RMQClient.xcodeproj
-xcode_scheme: RMQClient
+xcode_scheme: "RMQClient"
 before_install:
   - brew update
   - brew install rabbitmq
@@ -16,9 +16,11 @@ before_script:
   - make set_up_test_vhosts
   - make set_up_test_users
 env:
-  - TARGET=tests_ios TRAVIS_XCODE_SDK=iphonesimulator12.1 iOS_VERSION=12.1
-  - TARGET=tests_macos TRAVIS_XCODE_SDK=macosx10.14
-script: travis_retry make $TARGET iOS_VERSION=$iOS_VERSION
+  - TARGET=tests_ios   SCHEME="RMQClient" TRAVIS_XCODE_SDK=iphonesimulator12.1 iOS_VERSION=12.1
+  - TARGET=tests_macos SCHEME="RMQClient" TRAVIS_XCODE_SDK=macosx10.14
+  - TARGET=tests_ios   SCHEME="RMQClient with TLS tests" TRAVIS_XCODE_SDK=iphonesimulator12.1 iOS_VERSION=12.1
+  - TARGET=tests_macos SCHEME="RMQClient with TLS tests" TRAVIS_XCODE_SDK=macosx10.14
+script: travis_retry make $TARGET SCHEME=$ iOS_VERSION=$iOS_VERSION
 after_failure:
   - cat /usr/local/var/log/rabbitmq/[email protected]
 cache:

Makefile

@@ -1,7 +1,7 @@
-tests: tests_iOS tests_MacOS
-
 iOS_VERSION := 12.1
 
+SCHEME := "RMQClient"
+
 RABBITMQCTL := /usr/local/sbin/rabbitmqctl
 RABBITMQ_PLUGINS := /usr/local/sbin/rabbitmq-plugins
 
@@ -11,39 +11,26 @@ tests_ios: tests_iOS
 
 tests_macos: tests_MacOS
 
-tests_with_tls: tests_iOS_with_tls tests_macos_with_tls lint
-
 tests_iOS: test_dependencies
 	set -o pipefail && \
 		xcodebuild test \
 		-project RMQClient.xcodeproj \
-		-scheme RMQClient \
-		-destination 'platform=iOS Simulator,name=iPhone XR,OS=$(iOS_VERSION)' | \
-		xcpretty
-
-tests_iOS_with_tls: test_dependencies
-	set -o pipefail && \
-		xcodebuild test \
-		-project RMQClient.xcodeproj \
-		-scheme "RMQClient with TLS tests" \
+		-scheme "${SCHEME}" \
 		-destination 'platform=iOS Simulator,name=iPhone XR,OS=$(iOS_VERSION)' | \
 		xcpretty
 
 tests_MacOS: test_dependencies
 	set -o pipefail && \
 		xcodebuild test \
 		-project RMQClient.xcodeproj \
-		-scheme RMQClient \
+		-scheme "${SCHEME}" \
 		-destination 'platform=OS X,arch=x86_64' | \
 		xcpretty
 
-tests_MacOS_with_tls: test_dependencies
-	set -o pipefail && \
-		xcodebuild test \
-		-project RMQClient.xcodeproj \
-		-scheme "RMQClient with TLS tests" \
-		-destination 'platform=OS X,arch=x86_64' | \
-		xcpretty
+tests_with_tls:
+	${MAKE} tests_ios SCHEME="RMQClient with TLS tests"
+	${MAKE} tests_macos SCHEME="RMQClient with TLS tests"
+	${MAKE} lint
 
 test_dependencies: bootstrap
 	gem list -i xcpretty || gem install xcpretty