Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 788f879

Browse files
committed
stoped keeping the spawner alive
1 parent 54b2745 commit 788f879

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES"
3030
systemAttachmentLifetime = "keepNever">
31-
<AdditionalOptions>
32-
<AdditionalOption
33-
key = "NSZombieEnabled"
34-
value = "YES"
35-
isEnabled = "YES">
36-
</AdditionalOption>
37-
<AdditionalOption
38-
key = "MallocScribble"
39-
value = ""
40-
isEnabled = "YES">
41-
</AdditionalOption>
42-
</AdditionalOptions>
4331
<Testables>
4432
<TestableReference
4533
skipped = "NO"

testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,12 @@ - (BOOL)application:(UIApplication*)application
8181
return [super application:application didFinishLaunchingWithOptions:launchOptions];
8282
}
8383

84-
// TODO(https://github.com/flutter/flutter/issues/72019) Sharing threads doesn't work correctly yet
85-
// so we need to keep the Spawning engine alive. Once this issue is fixed we can remove s_spawner.
86-
static FlutterEngine* s_spawner;
87-
8884
- (FlutterEngine*)engineForTest:(NSString*)scenarioIdentifier {
8985
if ([scenarioIdentifier isEqualToString:@"spawn_engine_works"]) {
90-
if (s_spawner == nil) {
91-
s_spawner = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest" project:nil];
92-
[s_spawner run];
93-
}
94-
return [s_spawner spawnWithEntrypoint:nil libraryURI:nil];
86+
FlutterEngine* spawner = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
87+
project:nil];
88+
[spawner run];
89+
return [spawner spawnWithEntrypoint:nil libraryURI:nil];
9590
} else {
9691
FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest"
9792
project:nil];

testing/scenario_app/run_ios_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ fi
3636
cd ios/Scenarios
3737
set -o pipefail && xcodebuild -sdk iphonesimulator \
3838
-scheme Scenarios \
39-
-destination 'platform=iOS Simulator,name=iPhone 8' \
39+
-destination 'platform=iOS Simulator,OS=13.0,name=iPhone 8' \
4040
test \
4141
FLUTTER_ENGINE="$FLUTTER_ENGINE"

0 commit comments

Comments
 (0)