Merge pull request #552 from tombooth/fix-ios-simulator-tests

Fix fallback to iphonesimulator in script/cibuild

Author: pietbrauer

script/cibuild

@@ -118,7 +118,7 @@ build_scheme ()
     echo "*** Building and testing $scheme..."
     echo
 
-    local sdkflag=
+    local sdkflags=()
     local action=test
 
     # Determine whether we can run unit tests for this target.
@@ -129,17 +129,17 @@ build_scheme ()
     if [ "$awkstatus" -eq "1" ]
     then
         # SDK not found, try for iphonesimulator.
-        sdkflag='-sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 5"'
+        sdkflags=(-sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 5")
 
         # Determine whether the unit tests will run with iphonesimulator
-        run_xctool "$sdkflag" -scheme "$scheme" run-tests | parse_build
+        run_xctool "${sdkflags[@]}" -scheme "$scheme" run-tests | parse_build
 
         awkstatus=$?
 
         if [ "$awkstatus" -ne "0" ]
         then
             # Unit tests will not run on iphonesimulator.
-            sdkflag=""
+            sdkflags=()
         fi
     fi
 
@@ -149,7 +149,7 @@ build_scheme ()
         action=build
     fi
 
-    run_xctool $sdkflag -scheme "$scheme" $action
+    run_xctool "${sdkflags[@]}" -scheme "$scheme" $action
 }
 
 export -f build_scheme