Skip to content

Commit 5e049c3

Browse files
freakboy3742freakboy3742
authored
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.
1 parent 03df941 commit 5e049c3

3 files changed

Lines changed: 56 additions & 75 deletions

File tree

‎Misc/NEWS.d/next/Tests/2026-10-12-11-26-01.gh-issue-159211.FWFj-p.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The iOS testbed no longer gathers simulator diagnostics when a test run
2+
fails.

‎Platforms/Apple/testbed/__main__.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,18 @@ def xcode_test(location: Path, platform: str, simulator: str, verbose: bool):
8888
test_env["TEST_RUNNER_GITHUB_ACTIONS"] = os.environ["GITHUB_ACTIONS"]
8989

9090
print("Running test project...")
91-
# Test execution *can't* be run -quiet; verbose mode
92-
# is how we see the output of the test output.
91+
# Test execution *can't* be run -quiet; verbose mode is how we see the
92+
# output of the test output. However, we don't need test diagnostics -
93+
# they're large, and the context they contain generally isn't helpful for
94+
# CPython tests.
9395
process = subprocess.Popen(
94-
["xcodebuild", "test-without-building"] + args,
96+
[
97+
"xcodebuild",
98+
"test-without-building",
99+
"-collect-test-diagnostics",
100+
"never",
101+
]
102+
+ args,
95103
stdout=subprocess.PIPE,
96104
stderr=subprocess.STDOUT,
97105
env=test_env,

‎Platforms/Apple/testbed/iOSTestbed.xcodeproj/project.pbxproj‎

Lines changed: 43 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,14 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 56;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66162B0EFA380010BFC8 /* AppDelegate.m */; };
11-
71CB095279CCE565BAFB69C3 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D995ADFDE8B3EF5DDEB37874 /* SceneDelegate.m */; };
12-
607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607A66212B0EFA390010BFC8 /* Assets.xcassets */; };
13-
607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */; };
14-
607A66282B0EFA390010BFC8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66272B0EFA390010BFC8 /* main.m */; };
15-
607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 607A66312B0EFA3A0010BFC8 /* TestbedTests.m */; };
1610
607A664C2B0EFC080010BFC8 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; };
1711
607A664D2B0EFC080010BFC8 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1812
607A66502B0EFFE00010BFC8 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; };
1913
607A66512B0EFFE00010BFC8 /* Python.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607A664A2B0EFB310010BFC8 /* Python.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
20-
608619542CB77BA900F46182 /* app_packages in Resources */ = {isa = PBXBuildFile; fileRef = 608619532CB77BA900F46182 /* app_packages */; };
21-
608619562CB7819B00F46182 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 608619552CB7819B00F46182 /* app */; };
2214
/* End PBXBuildFile section */
2315

2416
/* Begin PBXContainerItemProxy section */
@@ -58,22 +50,41 @@
5850

5951
/* Begin PBXFileReference section */
6052
607A66122B0EFA380010BFC8 /* iOSTestbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSTestbed.app; sourceTree = BUILT_PRODUCTS_DIR; };
61-
607A66152B0EFA380010BFC8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
62-
607A66162B0EFA380010BFC8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
63-
83DC5E71F9D64737365A3BE4 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
64-
D995ADFDE8B3EF5DDEB37874 /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
65-
607A66212B0EFA390010BFC8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
66-
607A66242B0EFA390010BFC8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
67-
607A66272B0EFA390010BFC8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
6853
607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOSTestbedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
69-
607A66312B0EFA3A0010BFC8 /* TestbedTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestbedTests.m; sourceTree = "<group>"; };
7054
607A664A2B0EFB310010BFC8 /* Python.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Python.xcframework; sourceTree = "<group>"; };
71-
607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iOSTestbed-Info.plist"; sourceTree = "<group>"; };
72-
608619532CB77BA900F46182 /* app_packages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app_packages; sourceTree = "<group>"; };
73-
608619552CB7819B00F46182 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = "<group>"; };
7455
60FE0EFB2E56BB6D00524F87 /* iOSTestbed.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = iOSTestbed.xctestplan; sourceTree = "<group>"; };
7556
/* End PBXFileReference section */
7657

58+
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
59+
691FECCB8963969DDBED592E /* Exceptions for "iOSTestbed" folder in "iOSTestbed" target */ = {
60+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
61+
membershipExceptions = (
62+
"iOSTestbed-Info.plist",
63+
);
64+
target = 607A66112B0EFA380010BFC8 /* iOSTestbed */;
65+
};
66+
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
67+
68+
/* Begin PBXFileSystemSynchronizedRootGroup section */
69+
607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
70+
isa = PBXFileSystemSynchronizedRootGroup;
71+
exceptions = (
72+
691FECCB8963969DDBED592E /* Exceptions for "iOSTestbed" folder in "iOSTestbed" target */,
73+
);
74+
explicitFolders = (
75+
app,
76+
app_packages,
77+
);
78+
path = iOSTestbed;
79+
sourceTree = "<group>";
80+
};
81+
607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
82+
isa = PBXFileSystemSynchronizedRootGroup;
83+
path = TestbedTests;
84+
sourceTree = "<group>";
85+
};
86+
/* End PBXFileSystemSynchronizedRootGroup section */
87+
7788
/* Begin PBXFrameworksBuildPhase section */
7889
607A660F2B0EFA380010BFC8 /* Frameworks */ = {
7990
isa = PBXFrameworksBuildPhase;
@@ -102,7 +113,6 @@
102113
607A66142B0EFA380010BFC8 /* iOSTestbed */,
103114
607A66302B0EFA3A0010BFC8 /* TestbedTests */,
104115
607A66132B0EFA380010BFC8 /* Products */,
105-
607A664F2B0EFFE00010BFC8 /* Frameworks */,
106116
);
107117
sourceTree = "<group>";
108118
};
@@ -115,38 +125,6 @@
115125
name = Products;
116126
sourceTree = "<group>";
117127
};
118-
607A66142B0EFA380010BFC8 /* iOSTestbed */ = {
119-
isa = PBXGroup;
120-
children = (
121-
608619552CB7819B00F46182 /* app */,
122-
608619532CB77BA900F46182 /* app_packages */,
123-
607A66592B0F08600010BFC8 /* iOSTestbed-Info.plist */,
124-
607A66152B0EFA380010BFC8 /* AppDelegate.h */,
125-
607A66162B0EFA380010BFC8 /* AppDelegate.m */,
126-
83DC5E71F9D64737365A3BE4 /* SceneDelegate.h */,
127-
D995ADFDE8B3EF5DDEB37874 /* SceneDelegate.m */,
128-
607A66212B0EFA390010BFC8 /* Assets.xcassets */,
129-
607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */,
130-
607A66272B0EFA390010BFC8 /* main.m */,
131-
);
132-
path = iOSTestbed;
133-
sourceTree = "<group>";
134-
};
135-
607A66302B0EFA3A0010BFC8 /* TestbedTests */ = {
136-
isa = PBXGroup;
137-
children = (
138-
607A66312B0EFA3A0010BFC8 /* TestbedTests.m */,
139-
);
140-
path = TestbedTests;
141-
sourceTree = "<group>";
142-
};
143-
607A664F2B0EFFE00010BFC8 /* Frameworks */ = {
144-
isa = PBXGroup;
145-
children = (
146-
);
147-
name = Frameworks;
148-
sourceTree = "<group>";
149-
};
150128
/* End PBXGroup section */
151129

152130
/* Begin PBXNativeTarget section */
@@ -164,7 +142,12 @@
164142
);
165143
dependencies = (
166144
);
145+
fileSystemSynchronizedGroups = (
146+
607A66142B0EFA380010BFC8 /* iOSTestbed */,
147+
);
167148
name = iOSTestbed;
149+
packageProductDependencies = (
150+
);
168151
productName = iOSTestbed;
169152
productReference = 607A66122B0EFA380010BFC8 /* iOSTestbed.app */;
170153
productType = "com.apple.product-type.application";
@@ -183,7 +166,12 @@
183166
dependencies = (
184167
607A662F2B0EFA3A0010BFC8 /* PBXTargetDependency */,
185168
);
169+
fileSystemSynchronizedGroups = (
170+
607A66302B0EFA3A0010BFC8 /* TestbedTests */,
171+
);
186172
name = iOSTestbedTests;
173+
packageProductDependencies = (
174+
);
187175
productName = iOSTestbedTests;
188176
productReference = 607A662D2B0EFA3A0010BFC8 /* iOSTestbedTests.xctest */;
189177
productType = "com.apple.product-type.bundle.unit-test";
@@ -215,6 +203,8 @@
215203
Base,
216204
);
217205
mainGroup = 607A66092B0EFA380010BFC8;
206+
minimizedProjectReferenceProxies = 1;
207+
preferredProjectObjectVersion = 77;
218208
productRefGroup = 607A66132B0EFA380010BFC8 /* Products */;
219209
projectDirPath = "";
220210
projectRoot = "";
@@ -230,10 +220,6 @@
230220
isa = PBXResourcesBuildPhase;
231221
buildActionMask = 2147483647;
232222
files = (
233-
607A66252B0EFA390010BFC8 /* LaunchScreen.storyboard in Resources */,
234-
608619562CB7819B00F46182 /* app in Resources */,
235-
607A66222B0EFA390010BFC8 /* Assets.xcassets in Resources */,
236-
608619542CB77BA900F46182 /* app_packages in Resources */,
237223
);
238224
runOnlyForDeploymentPostprocessing = 0;
239225
};
@@ -274,17 +260,13 @@
274260
isa = PBXSourcesBuildPhase;
275261
buildActionMask = 2147483647;
276262
files = (
277-
607A66172B0EFA380010BFC8 /* AppDelegate.m in Sources */,
278-
71CB095279CCE565BAFB69C3 /* SceneDelegate.m in Sources */,
279-
607A66282B0EFA390010BFC8 /* main.m in Sources */,
280263
);
281264
runOnlyForDeploymentPostprocessing = 0;
282265
};
283266
607A66292B0EFA3A0010BFC8 /* Sources */ = {
284267
isa = PBXSourcesBuildPhase;
285268
buildActionMask = 2147483647;
286269
files = (
287-
607A66322B0EFA3A0010BFC8 /* TestbedTests.m in Sources */,
288270
);
289271
runOnlyForDeploymentPostprocessing = 0;
290272
};
@@ -298,17 +280,6 @@
298280
};
299281
/* End PBXTargetDependency section */
300282

301-
/* Begin PBXVariantGroup section */
302-
607A66232B0EFA390010BFC8 /* LaunchScreen.storyboard */ = {
303-
isa = PBXVariantGroup;
304-
children = (
305-
607A66242B0EFA390010BFC8 /* Base */,
306-
);
307-
name = LaunchScreen.storyboard;
308-
sourceTree = "<group>";
309-
};
310-
/* End PBXVariantGroup section */
311-
312283
/* Begin XCBuildConfiguration section */
313284
607A663F2B0EFA3A0010BFC8 /* Debug */ = {
314285
isa = XCBuildConfiguration;

0 commit comments

Comments
 (0)