Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
1d3bb8c2
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1d3bb8c2
编写于
12月 19, 2019
作者:
G
George Wright
提交者:
GitHub
12月 19, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix message_loop_fuchsia and thus enable fml_tests and flow_tests for Fuchsia (#14583)
上级
6e825e7b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
29 addition
and
20 deletion
+29
-20
BUILD.gn
BUILD.gn
+1
-3
fml/BUILD.gn
fml/BUILD.gn
+8
-2
fml/platform/fuchsia/message_loop_fuchsia.cc
fml/platform/fuchsia/message_loop_fuchsia.cc
+3
-3
runtime/BUILD.gn
runtime/BUILD.gn
+7
-11
shell/platform/fuchsia/dart_runner/BUILD.gn
shell/platform/fuchsia/dart_runner/BUILD.gn
+0
-1
testing/fuchsia/run_tests.sh
testing/fuchsia/run_tests.sh
+8
-0
testing/fuchsia/test_fars
testing/fuchsia/test_fars
+2
-0
未找到文件。
BUILD.gn
浏览文件 @
1d3bb8c2
...
...
@@ -129,9 +129,7 @@ if (is_fuchsia) {
deps = [
"$flutter_root/flow:flow_tests",
# TODO(gw280): Re-enable fml_tests on Fuchsia (https://github.com/flutter/flutter/issues/46122)
# "$flutter_root/fml:fml_tests",
"$flutter_root/fml:fml_tests",
"$flutter_root/shell/platform/fuchsia/flutter:flutter_runner_tests",
]
}
...
...
fml/BUILD.gn
浏览文件 @
1d3bb8c2
...
...
@@ -225,7 +225,6 @@ executable("fml_unittests") {
"memory/weak_ptr_unittest.cc",
"message_loop_task_queues_merge_unmerge_unittests.cc",
"message_loop_task_queues_unittests.cc",
"message_loop_unittests.cc",
"message_unittests.cc",
"paths_unittests.cc",
"platform/darwin/string_range_sanitization_unittests.mm",
...
...
@@ -242,7 +241,10 @@ executable("fml_unittests") {
# TODO(gw280): Figure out why these tests don't work currently on Fuchsia
if (!is_fuchsia) {
sources += [ "file_unittest.cc" ]
sources += [
"file_unittest.cc",
"message_loop_unittests.cc",
]
}
deps = [
...
...
@@ -252,6 +254,10 @@ executable("fml_unittests") {
"$flutter_root/runtime:libdart",
"$flutter_root/testing",
]
if (is_fuchsia && using_fuchsia_sdk) {
libs = [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
}
}
if (is_fuchsia) {
...
...
fml/platform/fuchsia/message_loop_fuchsia.cc
浏览文件 @
1d3bb8c2
...
...
@@ -30,9 +30,9 @@ void MessageLoopFuchsia::WakeUp(fml::TimePoint time_point) {
due_time
=
zx
::
nsec
((
time_point
-
now
).
ToNanoseconds
());
}
FML_DCHECK
(
async
::
PostDelayedTask
(
loop_
.
dispatcher
(),
[
this
]()
{
RunExpiredTasksNow
();
},
due_time
)
==
ZX_OK
);
auto
status
=
async
::
PostDelayedTask
(
loop_
.
dispatcher
(),
[
this
]()
{
RunExpiredTasksNow
();
},
due_time
);
FML_DCHECK
(
status
==
ZX_OK
);
}
}
// namespace fml
runtime/BUILD.gn
浏览文件 @
1d3bb8c2
...
...
@@ -28,17 +28,13 @@ source_set("test_font") {
group("libdart") {
public_deps = []
if (!(is_fuchsia && using_fuchsia_sdk)) {
if (flutter_runtime_mode == "profile" ||
flutter_runtime_mode == "release") {
public_deps +=
[ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
} else {
public_deps += [
"$flutter_root/lib/snapshot",
"//third_party/dart/runtime:libdart_jit",
]
}
if (flutter_runtime_mode == "profile" || flutter_runtime_mode == "release") {
public_deps += [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
} else {
public_deps += [
"$flutter_root/lib/snapshot",
"//third_party/dart/runtime:libdart_jit",
]
}
}
...
...
shell/platform/fuchsia/dart_runner/BUILD.gn
浏览文件 @
1d3bb8c2
...
...
@@ -53,7 +53,6 @@ template("runner") {
deps = [
"$flutter_root/common",
"$flutter_root/fml",
"$flutter_root/runtime:libdart",
"$flutter_root/shell/platform/fuchsia/dart-pkg/fuchsia",
"$flutter_root/shell/platform/fuchsia/dart-pkg/zircon",
"$fuchsia_sdk_root/pkg:async",
...
...
testing/fuchsia/run_tests.sh
浏览文件 @
1d3bb8c2
...
...
@@ -39,3 +39,11 @@ trap reboot EXIT
-f
flutter_runner_tests-0.far
\
-t
flutter_runner_tests
./fuchsia_ctl
-d
$device_name
test
\
-f
fml_tests-0.far
\
-t
fml_tests
./fuchsia_ctl
-d
$device_name
test
\
-f
flow_tests-0.far
\
-t
flow_tests
testing/fuchsia/test_fars
浏览文件 @
1d3bb8c2
flutter_runner_tests-0.far
fml_tests-0.far
flow_tests-0.far
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录