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

Commit 1f0209a

Browse files
committed
Revert "Minimal test harness for iOS (#13029)"
This reverts commit 0622b05.
1 parent af14d2a commit 1f0209a

File tree

6 files changed

+0
-126
lines changed

6 files changed

+0
-126
lines changed

build/darwin/ios_app.gni

Lines changed: 0 additions & 22 deletions
This file was deleted.

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,8 +850,6 @@ FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStan
850850
FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h
851851
FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm
852852
FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
853-
FILE: ../../../flutter/shell/platform/darwin/ios/FlutterTestsInfo.plist
854-
FILE: ../../../flutter/shell/platform/darwin/ios/flutter_unittests.mm
855853
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Flutter.podspec
856854
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h
857855
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h

shell/platform/darwin/ios/BUILD.gn

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
assert(is_ios)
66

77
import("//build/config/ios/ios_sdk.gni")
8-
import("//flutter/build/darwin/ios_app.gni")
98
import("//flutter/common/config.gni")
109
import("//flutter/shell/gpu/gpu.gni")
1110
import("//flutter/shell/platform/darwin/common/framework_shared.gni")
@@ -331,29 +330,6 @@ shared_library("copy_and_verify_framework_headers") {
331330
]
332331
}
333332

334-
test_fixtures("flutter_tests_fixtures") {
335-
fixtures = []
336-
}
337-
338-
# Note: This currently isn't used, it might be removed.
339-
ios_app("FlutterTests") {
340-
testonly = true
341-
342-
info_plist = "FlutterTestsInfo.plist"
343-
344-
sources = [
345-
"flutter_unittests.mm",
346-
]
347-
348-
libs = [ "Foundation.framework" ]
349-
350-
deps = [
351-
":flutter_tests_fixtures",
352-
"//flutter/runtime:libdart",
353-
"//flutter/testing",
354-
]
355-
}
356-
357333
group("flutter_framework") {
358334
deps = [
359335
":copy_and_verify_framework_headers",

shell/platform/darwin/ios/FlutterTestsInfo.plist

Lines changed: 0 additions & 20 deletions
This file was deleted.

shell/platform/darwin/ios/flutter_unittests.mm

Lines changed: 0 additions & 19 deletions
This file was deleted.

testing/run_all_unittests.cc

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include <iostream>
6-
#include <optional>
7-
#include <string>
8-
9-
#include "flutter/fml/backtrace.h"
10-
#include "flutter/fml/build_config.h"
11-
#include "flutter/fml/command_line.h"
12-
#include "flutter/testing/debugger_detection.h"
13-
#include "flutter/testing/test_timeout_listener.h"
145
#include "gtest/gtest.h"
156

16-
#ifdef OS_IOS
17-
#include <asl.h>
18-
#endif // OS_IOS
19-
20-
std::optional<fml::TimeDelta> GetTestTimeoutFromArgs(int argc, char** argv) {
21-
const auto command_line = fml::CommandLineFromArgcArgv(argc, argv);
22-
23-
std::string timeout_seconds;
24-
if (!command_line.GetOptionValue("timeout", &timeout_seconds)) {
25-
// No timeout specified. Default to 30s.
26-
return fml::TimeDelta::FromSeconds(30u);
27-
}
28-
29-
const auto seconds = std::stoi(timeout_seconds);
30-
31-
if (seconds < 1) {
32-
return std::nullopt;
33-
}
34-
35-
return fml::TimeDelta::FromSeconds(seconds);
36-
}
37-
387
int main(int argc, char** argv) {
39-
fml::InstallCrashHandler();
40-
#ifdef OS_IOS
41-
asl_log_descriptor(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO,
42-
ASL_LOG_DESCRIPTOR_WRITE);
43-
asl_log_descriptor(NULL, NULL, ASL_LEVEL_ERR, STDERR_FILENO,
44-
ASL_LOG_DESCRIPTOR_WRITE);
45-
#endif // OS_IOS
46-
478
::testing::InitGoogleTest(&argc, argv);
489

4910
// Check if the user has specified a timeout.

0 commit comments

Comments
 (0)