Allow make testios to work for all Apple Mobile platforms.

Author: freakboy3742

.gitignore

@@ -72,6 +72,7 @@ Lib/test/data/*
 /_bootstrap_python
 /Makefile
 /Makefile.pre
+/AppleTestbed.*
 Platforms/Apple/iOS/Frameworks/*
 Platforms/Apple/iOS/Resources/Info.plist
 Platforms/Apple/testbed/Python*.xcframework/*/bin

Makefile.pre.in

@@ -2298,30 +2298,31 @@ testuniversal: all
 	$(RUNSHARED) /usr/libexec/oah/translate \
 		./$(BUILDPYTHON) -E -m test -j 0 -u all $(TESTOPTS)
 
-# Run the test suite on the iOS simulator. Must be run on a macOS machine with
-# a full Xcode install that has an iPhone SE (3rd edition) simulator available.
+# Run the test suite on an Apple Mobile (i.e., iOS/tvOS/watchOS/visionOS)
+# device simulator. Must be run on a macOS machine with a full Xcode install
+# that has an SE-class simulator available for the chosen platform.
 # This must be run *after* a `make install` has completed the build. The
 # testbed is configured for the framework name used to configure the build;
 # that name is expected to be `Python`, optionally followed by uppercased ABI
 # flags (e.g., `PythonT`).
-XCFOLDER:=iOSTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
+XCFOLDER:=AppleTestbed.$(MULTIARCH).$(shell date +%s).$$PPID
 .PHONY: testios
 testios:
-	@if test "$(MACHDEP)" != "ios"; then \
-		echo "Cannot run the iOS testbed for a non-iOS build."; \
+	@if test "$(MACHDEP)" != "ios" -a "$(MACHDEP)" != "tvos" -a "$(MACHDEP)" != "visionos" -a "$(MACHDEP)" != "watchos" ; then \
+		echo "Cannot run the Apple mobile testbed for a $(MACHDEP) build."; \
 		exit 1;\
 	fi
-	@if test "$(findstring -iphonesimulator,$(MULTIARCH))" != "-iphonesimulator"; then \
-		echo "Cannot run the iOS testbed for non-simulator builds."; \
+	@if test "$(findstring simulator,$(MULTIARCH))" != "simulator"; then \
+		echo "Cannot run the Apple mobile testbed for non-simulator builds."; \
 		exit 1;\
 	fi
 	@if ! test -d $(PYTHONFRAMEWORKPREFIX); then \
-		echo "Cannot find a finalized iOS Python.framework. Have you run 'make install' to finalize the framework build?"; \
+		echo "Cannot find a finalized Python.framework. Have you run 'make install' to finalize the framework build?"; \
 		exit 1;\
 	fi
 
 	# Clone the testbed project into the XCFOLDER
-	$(PYTHON_FOR_BUILD) $(srcdir)/Platforms/Apple/testbed clone --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
+	$(PYTHON_FOR_BUILD) $(srcdir)/Platforms/Apple/testbed clone --platform $(MACHDEP) --framework $(PYTHONFRAMEWORKPREFIX) "$(XCFOLDER)"
 
 	# Run the testbed project
 	$(PYTHON_FOR_BUILD) "$(XCFOLDER)" run --verbose -- test -uall --single-process --rerun -W --pythoninfo

Platforms/Apple/__main__.py

@@ -115,6 +115,11 @@
 }
 
 
+def platform_name(value):
+    """Return the canonical spelling for a platform name."""
+    return {p.lower(): p for p in HOSTS.keys()}.get(value.lower(), value)
+
+
 def validate_abiflags(value: str) -> str:
     """Validate an `--abiflags` value (for use as an argparse type)."""
     known = "".join(ABIFLAG_CONFIGURE_ARGS)
@@ -1054,6 +1059,7 @@ def parse_args() -> argparse.Namespace:
         cmd.add_argument(
             "platform",
             choices=HOSTS.keys(),
+            type=platform_name,
             help="The target platform to build",
         )
 

Platforms/Apple/testbed/__main__.py

@@ -489,6 +489,12 @@ def main():
         if (Path(__file__).parent / f"{platform}Testbed").is_dir()
     ]
 
+    def platform_name(value):
+        """Return the canonical spelling for a platform name."""
+        return {p.lower(): p for p in available_platforms}.get(
+            value.lower(), value
+        )
+
     parser = argparse.ArgumentParser(
         description=(
             "Manages the process of testing an Apple Python project "
@@ -519,6 +525,7 @@ def main():
         dest="platform",
         choices=available_platforms,
         default=available_platforms[0],
+        type=platform_name,
         help=f"The platform to target (default: {available_platforms[0]})",
     )
     clone.add_argument(
@@ -551,6 +558,7 @@ def main():
         dest="platform",
         choices=available_platforms,
         default=available_platforms[0],
+        type=platform_name,
         help=f"The platform to target (default: {available_platforms[0]})",
     )
     run.add_argument(