Merge pull request #193 from kishikawakatsumi/rake

Refine test commands

.travis.yml

@@ -7,10 +7,10 @@ install:
   - brew update && brew install carthage
   - "(cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)"
 before_script:
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/developer.p12.enc -d -a -out ./Lib/Certificates/developer.p12
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/iOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/iOS_Development.mobileprovision
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/tvOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/tvOS_Development.mobileprovision
-  - ./Lib/Scripts/add_key.sh
+  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/developer.p12.enc -d -a -out ./Lib/Certificates/developer.p12 || true
+  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/iOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/iOS_Development.mobileprovision || true
+  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/tvOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/tvOS_Development.mobileprovision || true
+  - ./Lib/Scripts/add_key.sh || true
 script:
   - "(cd Lib && bundle exec rake build test:iphonesimulator test:appletvsimulator test:macosx coverage:coveralls test:carthage)"
 branches:

Lib/Rakefile

@@ -1,28 +1,35 @@
 require 'xcjobs'
 
-def destinations
-  [ 'name=iPad 2,OS=8.1',
-    'name=iPad Air,OS=8.1',
-    'name=iPhone 4s,OS=8.1',
-    'name=iPhone 5,OS=8.1',
-    'name=iPhone 5s,OS=8.1',
-    'name=iPhone 6,OS=8.1',
-    'name=iPhone 6 Plus,OS=8.1',
-    'name=iPhone 6,OS=9.0',
-    'name=iPhone 6 Plus,OS=9.0',
-    'name=iPhone 6,OS=9.1',
-    'name=iPhone 6 Plus,OS=9.1'
-  ]
-end
-
-def supportedPlatforms(test: false)
-  if test
-    ['macosx', 'iphoneos', 'iphonesimulator', 'appletvos', 'appletvsimulator']
+def destinations(platform: 'iphonesimulator')
+  if platform == 'iphonesimulator'
+    [ 'name=iPad 2,OS=8.1',
+      'name=iPad Air,OS=8.1',
+      'name=iPhone 4s,OS=8.1',
+      'name=iPhone 5,OS=8.1',
+      'name=iPhone 5s,OS=8.1',
+      'name=iPhone 6,OS=8.1',
+      'name=iPhone 6 Plus,OS=8.1',
+      'name=iPhone 6,OS=9.0',
+      'name=iPhone 6 Plus,OS=9.0',
+      'name=iPhone 6,OS=9.1',
+      'name=iPhone 6 Plus,OS=9.1'
+    ]
+  elsif platform == 'watchsimulator'
+    [ 'name=Apple Watch - 38mm,OS=2.0',
+      'name=Apple Watch - 42mm,OS=2.0'
+    ]
+  elsif platform == 'appletvsimulator'
+    [ 'name=Apple TV 1080p,OS=9.0'
+    ]
   else
-    ['macosx', 'iphoneos', 'iphonesimulator', 'watchos', 'watchsimulator', 'appletvos', 'appletvsimulator']
+    []
   end
 end
 
+def supportedPlatforms
+  ['macosx', 'iphoneos', 'iphonesimulator', 'watchos', 'watchsimulator', 'appletvos', 'appletvsimulator']
+end
+
 def configurations
   ['Debug', 'Release']
 end
@@ -41,6 +48,13 @@ namespace :build do
       t.project = 'KeychainAccess'
       t.scheme = 'KeychainAccess'
       t.sdk = platform
+      if platform == 'iphonesimulator'
+        t.add_destination('name=iPhone 6,OS=9.1')
+      elsif platform == 'watchsimulator'
+        t.add_destination('name=Apple Watch - 42mm,OS=2.0')
+      elsif platform == 'appletvsimulator'
+        t.add_destination('name=Apple TV 1080p,OS=9.0')
+      end
       t.configuration = configuration
       t.build_dir = 'build'
       t.formatter = 'xcpretty -c'
@@ -69,13 +83,11 @@ namespace :test do
       t.project = 'KeychainAccess'
       t.scheme = 'KeychainAccess'
       t.sdk = platform
+      destinations(platform: platform).each do |destination|
+        t.add_destination(destination)
+      end
       t.configuration = configuration
       t.coverage = true
-      if platform == 'iphonesimulator'
-        destinations.each do |destination|
-          t.add_destination(destination)
-        end
-      end
       t.build_dir = 'build'
       t.formatter = 'xcpretty -c'
     end