iOS test builds #3415

pepone · 2025-01-23T18:09:14Z

Managed to get C++ iOS back to build with this PR, but all tests hang, not clear why.

-- EDIT 1 --

Tests are running with the simulator, didn't check a device.

We don't directly test the XCFramework but we build against the static libraries used to created it.

I think it is good enough for Fix #3119

externl

Looks good!

pepone · 2025-01-24T11:53:36Z

cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj

@@ -308,7 +308,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#\n# We don't use a CopyFile build phase here to copy the test bundles because the test\n# bundles are located in different location depending on the platform. This script\n# copies the bundles if updated and sign them.\n#\n\nset -e\n\nFRAMEWORKS_PATH=\"${TARGET_BUILD_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncd \"../bundles/Bundles-${PLATFORM_NAME}\"\nif [ ! -d \"$FRAMEWORKS_PATH\" ]; then\nmkdir -p \"$FRAMEWORKS_PATH\"\nfi;\nfor i in `ls -d */*.bundle`;\n                  do\n                  if [ ! -d \"$FRAMEWORKS_PATH/$i\" -o \"$i\" -nt \"$FRAMEWORKS_PATH/$i\" ]; then\n                  echo \"Copying $i\"\n                  mkdir -p \"$FRAMEWORKS_PATH/$(dirname $i)\"\n                  cp -rf $i \"$FRAMEWORKS_PATH/$(dirname $i)\"\n                  if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" ]; then\n                  codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --preserve-metadata=identifier,entitlements \"${FRAMEWORKS_PATH}/$i\"\n                  fi;\n                  fi;\n                  done\n                  \n";
+			shellScript = "# We don't use a CopyFile build phase here to copy the test bundles because the test bundles are located in different\n# location depending on the platform. This script copies the bundles if updated and sign them.\n\nset -e\n\nFRAMEWORKS_PATH=\"${TARGET_BUILD_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncd \"../bundles/Bundles-${PLATFORM_NAME}\"\n\nif [ ! -d \"$FRAMEWORKS_PATH\" ]; then\n    mkdir -p \"$FRAMEWORKS_PATH\"\nfi;\n\nfor i in `find . -name \"*.bundle\"`;\ndo\n    # ./test_Ice_defaultValue/iphonesimulator/client.bundle -> test_Ice_defaultValue\n    testsuite=$(basename $(dirname $(dirname $i)))\n    # ./test_Ice_defaultValue/iphonesimulator/client.bundle -> client.bundle\n    bundle=$(basename $i)\n\n    bundle_target_path=\"${FRAMEWORKS_PATH}/${testsuite}/${bundle}\"\n\n    if [ ! -d \"$bundle_target_path\" -o \"$i\" -nt \"$bundle_target_path\" ]; then\n        echo \"Copying $i -> $bundle_target_path\"\n        mkdir -p \"$bundle_target_path\"\n        cp -rf $i/* \"${bundle_target_path}\"\n        if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" ]; then\n            codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --preserve-metadata=identifier,entitlements \"${bundle_target_path}\"\n        fi;\n    fi;\ndone\n";


We have this script to copy and sign the bundles, the old version was not working...

Inlined the new version here for easy review.

# We don't use a CopyFile build phase here to copy the test bundles because the test bundles are located in different # location depending on the platform. This script copies the bundles if updated and sign them. set -e FRAMEWORKS_PATH="${TARGET_BUILD_DIR}"/"${FRAMEWORKS_FOLDER_PATH}" cd "../bundles/Bundles-${PLATFORM_NAME}" if [ ! -d "$FRAMEWORKS_PATH" ]; then mkdir -p "$FRAMEWORKS_PATH" fi; for i in `find . -name "*.bundle"`; do # ./test_Ice_defaultValue/iphonesimulator/client.bundle -> test_Ice_defaultValue testsuite=$(basename $(dirname $(dirname $i))) # ./test_Ice_defaultValue/iphonesimulator/client.bundle -> client.bundle bundle=$(basename $i) bundle_target_path="${FRAMEWORKS_PATH}/${testsuite}/${bundle}" if [ ! -d "$bundle_target_path" -o "$i" -nt "$bundle_target_path" ]; then echo "Copying $i -> $bundle_target_path" mkdir -p "$bundle_target_path" cp -rf $i/* "${bundle_target_path}" if [ -n "${EXPANDED_CODE_SIGN_IDENTITY_NAME}" ]; then codesign --force --sign "${EXPANDED_CODE_SIGN_IDENTITY}" --preserve-metadata=identifier,entitlements "${bundle_target_path}" fi; fi; done

pepone · 2025-01-24T11:54:31Z

cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj

 				);
 				INFOPLIST_FILE = Bundle/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
-				LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib";
+				LIBRARY_SEARCH_PATHS = "../../../lib/$(PLATFORM_NAME)";


we link directly with the static libraries from lib/iphoneos or lib/iphonesimulator.

pepone · 2025-01-24T11:55:05Z

cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj

 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = (
-					"-L../../Common/build/$(PLATFORM_NAME)/xcodesdk",
+					"-L../../Common/build/$(PLATFORM_NAME)/static",


for the test helper static library.

pepone · 2025-01-24T11:55:55Z

scripts/Component.py

@@ -86,7 +86,7 @@ def getFilters(self, mapping, config):
                    "Ice/plugin",
                    "Ice/stringConverter",
                    "Ice/threadPoolPriority",
-                    "Ice/udp",


Not clear why we excluded udp test, seems to work fine. We no longer build service libraries for iOS.

pepone · 2025-01-24T11:57:39Z

scripts/Util.py

-        )
-        return os.path.join(
-            path, "{0}-{1}".format(build, current.config.buildPlatform), appName
+        cmd = "xcodebuild -project 'test/ios/controller/C++ Test Controller.xcodeproj' \


This is similar to what we do in Swift, the previous version relied on build dir being within the project dir.

pepone · 2025-01-24T11:59:30Z

scripts/Util.py

+                          -arch arm64 \
+                          -showBuildSettings \
+                          ".format(
+            "Release" if os.environ.get("OPTIMIZE", "yes") != "no" else "Debug",


This means you have to use the same OPTIMIZE env value for build and run allTests.py, I don't see a better way to do it. For C++ builds there is no separate release/debug configurations.

iOS test builds

8bae624

pepone requested a review from externl January 23, 2025 18:09

externl approved these changes Jan 23, 2025

View reviewed changes

Fixes to build and run the C++ iOS test controller

c25e9a1

pepone marked this pull request as ready for review January 24, 2025 11:50

pepone commented Jan 24, 2025

View reviewed changes

pepone requested a review from externl January 24, 2025 12:02

Fix whitespaces

b17596a

externl approved these changes Jan 24, 2025

View reviewed changes

Cleanup Xcode project build rules

c442592

pepone merged commit 16febee into zeroc-ice:main Jan 24, 2025
23 of 24 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

iOS test builds #3415

iOS test builds #3415

pepone commented Jan 23, 2025 •

edited

Loading

externl left a comment

pepone Jan 24, 2025

pepone Jan 24, 2025

pepone Jan 24, 2025

pepone Jan 24, 2025

pepone Jan 24, 2025

pepone Jan 24, 2025

iOS test builds #3415

iOS test builds #3415

Conversation

pepone commented Jan 23, 2025 • edited Loading

externl left a comment

Choose a reason for hiding this comment

pepone Jan 24, 2025

Choose a reason for hiding this comment

pepone Jan 24, 2025

Choose a reason for hiding this comment

pepone Jan 24, 2025

Choose a reason for hiding this comment

pepone Jan 24, 2025

Choose a reason for hiding this comment

pepone Jan 24, 2025

Choose a reason for hiding this comment

pepone Jan 24, 2025

Choose a reason for hiding this comment

pepone commented Jan 23, 2025 •

edited

Loading