Update to jspahrsummers/objc-build-scripts@a54782

Author: jspahrsummers

script/bootstrap

@@ -10,7 +10,7 @@ config ()
 {
     # A whitespace-separated list of executables that must be present and locatable.
     : ${REQUIRED_TOOLS="xctool"}
-    
+
     export REQUIRED_TOOLS
 }
 
@@ -28,7 +28,14 @@ main ()
         check_deps
     fi
 
-    local submodules=$(git submodule status 2>/dev/null)
+    local submodules=$(git submodule status)
+    local result=$?
+
+    if [ "$result" -ne "0" ]
+    then
+        exit $result
+    fi
+
     if [ -n "$submodules" ]
     then
         echo "*** Updating submodules..."

script/cibuild

@@ -39,8 +39,8 @@ config ()
     # A whitespace-separated list of default schemes to build.
     #
     # Individual names can be quoted to avoid word splitting.
-    : ${SCHEMES:=$(xcodebuild -list 2>/dev/null | awk -f "$SCRIPT_DIR/schemes.awk")}
-    
+    : ${SCHEMES:=$(xcodebuild -list -project "$XCODEPROJ" 2>/dev/null | awk -f "$SCRIPT_DIR/schemes.awk")}
+
     export XCWORKSPACE
     export XCODEPROJ
     export BOOTSTRAP
@@ -120,16 +120,27 @@ build_scheme ()
 
     local awkstatus=$?
 
-    if [ "$awkstatus" -ne "0" ]
+    if [ "$awkstatus" -eq "1" ]
     then
-        # Unit tests aren't supported.
-        action=build
+        # SDK not found, try for iphonesimulator.
+        sdkflag="-sdk iphonesimulator"
+
+        # Determine whether the unit tests will run with iphonesimulator
+        run_xctool $sdkflag -scheme "$scheme" run-tests | parse_build
+
+        awkstatus=$?
+
+        if [ "$awkstatus" -ne "0" ]
+        then
+            # Unit tests will not run on iphonesimulator.
+            sdkflag=""
+        fi
     fi
 
-    if [ "$awkstatus" -eq "1" ]
+    if [ "$awkstatus" -ne "0" ]
     then
-        # Build for iOS.
-        sdkflag="-sdk iphonesimulator"
+        # Unit tests aren't supported.
+        action=build
     fi
 
     run_xctool $sdkflag -scheme "$scheme" $action

script/schemes.awk

@@ -2,10 +2,8 @@ BEGIN {
     FS = "\n";
 }
 
-/Targets:/ {
+/Schemes:/ {
     while (getline && $0 != "") {
-        if ($0 ~ /Test/) continue;
-
         sub(/^ +/, "");
         print "'" $0 "'";
     }