https://github.com/python/cpython/commit/5e049c371f0fdbf07bdf058ee383d6228b391546
commit: 5e049c371f0fdbf07bdf058ee383d6228b391546
branch: main
author: Russell Keith-Magee <[email protected]>
committer: freakboy3742 <[email protected]>
date: 2026-10-12T14:37:32+08:00
summary:
gh-159211: Omit test diagnostics from iOS testbed runs (#159212)
Omit test diagnostics from iOS testbed runs. These diagnostics are rarely
helpful in the context of an iOS test failure.
files:
A Misc/NEWS.d/next/Tests/2026-10-12-11-26-01.gh-issue-159211.FWFj-p.rst
M Platforms/Apple/testbed/__main__.py
M Platforms/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
diff --git
a/Misc/NEWS.d/next/Tests/2026-10-12-11-26-01.gh-issue-159211.FWFj-p.rst
b/Misc/NEWS.d/next/Tests/2026-10-12-11-26-01.gh-issue-159211.FWFj-p.rst
new file mode 100644
index 000000000000000..58ee94ddf3ac32c
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2026-10-12-11-26-01.gh-issue-159211.FWFj-p.rst
@@ -0,0 +1,2 @@
+The iOS testbed no longer gathers simulator diagnostics when a test run
+fails.
diff --git a/Platforms/Apple/testbed/__main__.py
b/Platforms/Apple/testbed/__main__.py
index 797b522678f9d74..c4c60e99ca974de 100644
--- a/Platforms/Apple/testbed/__main__.py
+++ b/Platforms/Apple/testbed/__main__.py
@@ -88,10 +88,18 @@ def xcode_test(location: Path, platform: str, simulator:
str, verbose: bool):
test_env["TEST_RUNNER_GITHUB_ACTIONS"] = os.environ["GITHUB_ACTIONS"]
print("Running test project...")
- # Test execution *can't* be run -quiet; verbose mode
- # is how we see the output of the test output.
+ # Test execution *can't* be run -quiet; verbose mode is how we see the
+ # output of the test output. However, we don't need test diagnostics -
+ # they're large, and the context they contain generally isn't helpful for
+ # CPython tests.
process = subprocess.Popen(
- ["xcodebuild", "test-without-building"] + args,
+ [
+ "xcodebuild",
+ "test-without-building",
+ "-collect-test-diagnostics",
+ "never",
+ ]
+ + args,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
env=test_env,
diff --git a/Platforms/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
b/Platforms/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
index 1f9e3f23a02dcaf..a0dd6851dc103da 100644
--- a/Platforms/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
+++ b/Platforms/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj
@@ -3,22 +3,14 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 56;
+ objectVersion = 77;
objects = {
/* Begin PBXBuildFile section */
- 607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa
= PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
- 71CB095279CCE565BAFB69C3 /* SceneDelegate.m in Sources */ =
{isa = PBXBuildFile; fileRef = D995ADFDE8B3EF5DDEB37874 /* SceneDelegate.m */;
};
- 607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ =
{isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */;
};
- 607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in
Resources */ = {isa = PBXBuildFile; fileRef = 607A66232B0EFA390010BFC8 /*
LaunchScreen.storyboard */; };
- 607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa =
PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
- 607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */ = {isa
= PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */; };
607A664C2B0EFC080010BFC8 /* Python.xcframework in Frameworks */
= {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework
*/; };
607A664D2B0EFC080010BFC8 /* Python.xcframework in Embed
Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /*
Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy,
RemoveHeadersOnCopy, ); }; };
607A66502B0EFFE00010BFC8 /* Python.xcframework in Frameworks */
= {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework
*/; };
607A66512B0EFFE00010BFC8 /* Python.xcframework in Embed
Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /*
Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy,
RemoveHeadersOnCopy, ); }; };
- 608619542CB77BA900F46182 /* app_packages in Resources */ = {isa
= PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
- 608619562CB7819B00F46182 /* app in Resources */ = {isa =
PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -58,22 +50,41 @@
/* Begin PBXFileReference section */
607A66122B0EFA380010BFC8 /* iOSTestbed.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = iOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h;
sourceTree = "<group>"; };
- 607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m;
sourceTree = "<group>"; };
- 83DC5E71F9D64737365A3BE4 /* SceneDelegate.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h;
sourceTree = "<group>"; };
- D995ADFDE8B3EF5DDEB37874 /* SceneDelegate.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
SceneDelegate.m; sourceTree = "<group>"; };
- 607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa =
PBXFileReference; lastKnownFileType = folder.assetcatalog; path =
Assets.xcassets; sourceTree = "<group>"; };
- 607A66242B0EFA390010BFC8 /* Base */ = {isa = PBXFileReference;
lastKnownFileType = file.storyboard; name = Base; path =
Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
- 607A66272B0EFA390010BFC8 /* main.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m;
sourceTree = "<group>"; };
607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */ = {isa =
PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path
= iOSTestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
- 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestbedTests.m;
sourceTree = "<group>"; };
607A664A2B0EFB310010BFC8 /* Python.xcframework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.xcframework; path =
Python.xcframework; sourceTree = "<group>"; };
- 607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path =
"iOSTestbed-Info.plist"; sourceTree = "<group>"; };
- 608619532CB77BA900F46182 /* app_packages */ = {isa =
PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree =
"<group>"; };
- 608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference;
lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
60FE0EFB2E56BB6D00524F87 /* iOSTestbed.xctestplan */ = {isa =
PBXFileReference; lastKnownFileType = text; path = iOSTestbed.xctestplan;
sourceTree = "<group>"; };
/* End PBXFileReference section */
+/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+ 691FECCB8963969DDBED592E /* Exceptions for "iOSTestbed" folder
in "iOSTestbed" target */ = {
+ isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+ membershipExceptions = (
+ "iOSTestbed-Info.plist",
+ );
+ target = 607A66112B0EFA380010BFC8 /* iOSTestbed */;
+ };
+/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
+
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+ 607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
+ isa = PBXFileSystemSynchronizedRootGroup;
+ exceptions = (
+ 691FECCB8963969DDBED592E /* Exceptions for
"iOSTestbed" folder in "iOSTestbed" target */,
+ );
+ explicitFolders = (
+ app,
+ app_packages,
+ );
+ path = iOSTestbed;
+ sourceTree = "<group>";
+ };
+ 607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
+ isa = PBXFileSystemSynchronizedRootGroup;
+ path = TestbedTests;
+ sourceTree = "<group>";
+ };
+/* End PBXFileSystemSynchronizedRootGroup section */
+
/* Begin PBXFrameworksBuildPhase section */
607A660F2B0EFA380010BFC8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
@@ -102,7 +113,6 @@
607A66142B0EFA380010BFC8 /* iOSTestbed */,
607A66302B0EFA3A0010BFC8 /* TestbedTests */,
607A66132B0EFA380010BFC8 /* Products */,
- 607A664F2B0EFFE00010BFC8 /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -115,38 +125,6 @@
name = Products;
sourceTree = "<group>";
};
- 607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
- isa = PBXGroup;
- children = (
- 608619552CB7819B00F46182 /* app */,
- 608619532CB77BA900F46182 /* app_packages */,
- 607A66592B0F08600010BFC8 /*
iOSTestbed-Info.plist */,
- 607A66152B0EFA380010BFC8 /* AppDelegate.h */,
- 607A66162B0EFA380010BFC8 /* AppDelegate.m */,
- 83DC5E71F9D64737365A3BE4 /* SceneDelegate.h */,
- D995ADFDE8B3EF5DDEB37874 /* SceneDelegate.m */,
- 607A66212B0EFA390010BFC8 /* Assets.xcassets */,
- 607A66232B0EFA390010BFC8 /*
LaunchScreen.storyboard */,
- 607A66272B0EFA390010BFC8 /* main.m */,
- );
- path = iOSTestbed;
- sourceTree = "<group>";
- };
- 607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
- isa = PBXGroup;
- children = (
- 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */,
- );
- path = TestbedTests;
- sourceTree = "<group>";
- };
- 607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- );
- name = Frameworks;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -164,7 +142,12 @@
);
dependencies = (
);
+ fileSystemSynchronizedGroups = (
+ 607A66142B0EFA380010BFC8 /* iOSTestbed */,
+ );
name = iOSTestbed;
+ packageProductDependencies = (
+ );
productName = iOSTestbed;
productReference = 607A66122B0EFA380010BFC8 /*
iOSTestbed.app */;
productType = "com.apple.product-type.application";
@@ -183,7 +166,12 @@
dependencies = (
607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency
*/,
);
+ fileSystemSynchronizedGroups = (
+ 607A66302B0EFA3A0010BFC8 /* TestbedTests */,
+ );
name = iOSTestbedTests;
+ packageProductDependencies = (
+ );
productName = iOSTestbedTests;
productReference = 607A662D2B0EFA3A0010BFC8 /*
iOSTestbedTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
@@ -215,6 +203,8 @@
Base,
);
mainGroup = 607A66092B0EFA380010BFC8;
+ minimizedProjectReferenceProxies = 1;
+ preferredProjectObjectVersion = 77;
productRefGroup = 607A66132B0EFA380010BFC8 /* Products
*/;
projectDirPath = "";
projectRoot = "";
@@ -230,10 +220,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 607A66252B0EFA390010BFC8 /*
LaunchScreen.storyboard in Resources */,
- 608619562CB7819B00F46182 /* app in Resources */,
- 607A66222B0EFA390010BFC8 /* Assets.xcassets in
Resources */,
- 608619542CB77BA900F46182 /* app_packages in
Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -274,9 +260,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 607A66172B0EFA380010BFC8 /* AppDelegate.m in
Sources */,
- 71CB095279CCE565BAFB69C3 /* SceneDelegate.m in
Sources */,
- 607A66282B0EFA390010BFC8 /* main.m in Sources
*/,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -284,7 +267,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 607A66322B0EFA3A0010BFC8 /* TestbedTests.m in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -298,17 +280,6 @@
};
/* End PBXTargetDependency section */
-/* Begin PBXVariantGroup section */
- 607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */ = {
- isa = PBXVariantGroup;
- children = (
- 607A66242B0EFA390010BFC8 /* Base */,
- );
- name = LaunchScreen.storyboard;
- sourceTree = "<group>";
- };
-/* End PBXVariantGroup section */
-
/* Begin XCBuildConfiguration section */
607A663F2B0EFA3A0010BFC8 /* Debug */ = {
isa = XCBuildConfiguration;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
