Merge pull request #458 from nickmshelley/travis-jobs

Closes #457: Split up tests into more Travis jobs.

Author: stephencelis

.travis.yml

@@ -1,10 +1,13 @@
 language: objective-c
-env:
-  - BUILD_SCHEME="SQLite iOS"
-  - BUILD_SCHEME="SQLite Mac"
+matrix:
+  include:
+    - env: BUILD_SCHEME="SQLite iOS"
+    - env: BUILD_SCHEME="SQLite Mac"
+    - env: VALIDATOR_SUBSPEC="none"
+    - env: VALIDATOR_SUBSPEC="standard"
+    - env: VALIDATOR_SUBSPEC="standalone"
 before_install:
   - gem install xcpretty --no-document
 script:
-  - make test
-  - cd CocoaPodsTests && make test
+  - ./run-tests.sh
 osx_image: xcode7.3

CocoaPodsTests/integration_test.rb

@@ -13,13 +13,19 @@ def test_validate_project
 
   def validator
     @validator ||= TestRunningValidator.new(podspec, []).tap do |validator|
+    	subspec = ENV["VALIDATOR_SUBSPEC"]
         validator.test_files = Dir["#{project_test_dir}/*.swift"]
         validator.config.verbose = true
         validator.no_clean = true
         validator.use_frameworks = true
         validator.fail_fast = true
         validator.local = true
         validator.allow_warnings = true
+        if subspec == "none"
+          validator.no_subspecs = true
+        else
+          validator.only_subspec = subspec
+        end
     end
   end
 

run-tests.sh

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