From 5655b254a77f5a7cae8f4cf8036a63805d460795 Mon Sep 17 00:00:00 2001
From: Joe McMahon <joe.mcmahon@gmail.com>
Date: Fri, 8 Dec 2023 22:22:02 -0800
Subject: [PATCH] Update ios.yml

Turn tests back on now that they work
---
 .github/workflows/ios.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 90ab2ba8..b655b361 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -31,15 +31,14 @@ jobs:
           if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
           file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
           xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
-# Disable testing for now
-#       - name: Test
-#         env:
-#           scheme: ${{ 'default' }}
-#           platform: ${{ 'iOS Simulator' }}
-#         run: |
-#           # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
-#           device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
-#           if [ $scheme = default ]; then scheme=$(cat default); fi
-#           if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
-#           file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
-#           xcodebuild test-without-building -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
+       - name: Test
+         env:
+           scheme: ${{ 'default' }}
+           platform: ${{ 'iOS Simulator' }}
+         run: |
+           # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
+           device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
+           if [ $scheme = default ]; then scheme=$(cat default); fi
+           if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
+           file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
+           xcodebuild test-without-building -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"