Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
a3c3a632
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,发现更多精彩内容 >>
提交
a3c3a632
编写于
7月 28, 2015
作者:
E
Eric Seidel
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #317 from eseidelGoogle/mac_testing
Make test_sky work on Mac!
上级
24b6312d
0eb4c0af
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
12 addition
and
30 deletion
+12
-30
sky/dist/BUILD.gn
sky/dist/BUILD.gn
+1
-1
sky/shell/BUILD.gn
sky/shell/BUILD.gn
+2
-2
sky/shell/mac/platform_service_provider_mac.cc
sky/shell/mac/platform_service_provider_mac.cc
+5
-3
sky/tools/webkitpy/layout_tests/port/android.py
sky/tools/webkitpy/layout_tests/port/android.py
+0
-3
sky/tools/webkitpy/layout_tests/port/base.py
sky/tools/webkitpy/layout_tests/port/base.py
+0
-13
sky/tools/webkitpy/layout_tests/port/linux.py
sky/tools/webkitpy/layout_tests/port/linux.py
+0
-3
sky/tools/webkitpy/layout_tests/port/mac.py
sky/tools/webkitpy/layout_tests/port/mac.py
+4
-5
未找到文件。
sky/dist/BUILD.gn
浏览文件 @
a3c3a632
...
...
@@ -26,7 +26,7 @@ copy("sky_shell") {
]
} else if (is_ios || is_mac) {
sources = [
"$root_build_dir/Sky.app",
"$root_build_dir/Sky
Shell
.app",
]
deps = [
...
...
sky/shell/BUILD.gn
浏览文件 @
a3c3a632
...
...
@@ -168,7 +168,7 @@ if (is_android) {
import("//build/config/ios/ios_sdk.gni")
ios_app("shell") {
app_name = "Sky"
app_name = "Sky
Shell
"
info_plist = "ios/Info.plist"
scaffolding_target = "ios_scaffolding"
entitlements_path = "ios/Entitlements.xcent"
...
...
@@ -232,7 +232,7 @@ if (is_android) {
import("//build/config/mac/rules.gni")
mac_app("shell") {
app_name = "Sky"
app_name = "Sky
Shell
"
info_plist = "mac/Info.plist"
scaffolding_target = "mac_scaffolding"
...
...
sky/shell/mac/platform_service_provider_mac.cc
浏览文件 @
a3c3a632
...
...
@@ -2,15 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "sky/engine/wtf/Assertions.h"
#include "sky/shell/service_provider.h"
#include "base/single_thread_task_runner.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/single_thread_task_runner.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "sky/engine/wtf/Assertions.h"
#include "sky/services/ns_net/network_service_impl.h"
#include "sky/shell/service_provider.h"
#include "sky/shell/testing/test_runner.h"
namespace
sky
{
namespace
shell
{
...
...
@@ -26,6 +27,7 @@ static void CreatePlatformServiceProvider(
g_service_provider
.
Get
().
reset
(
new
mojo
::
ServiceProviderImpl
(
request
.
Pass
()));
g_network_service_factory
.
Get
().
reset
(
new
mojo
::
NetworkServiceFactory
());
g_service_provider
.
Get
()
->
AddService
(
g_network_service_factory
.
Get
().
get
());
g_service_provider
.
Get
()
->
AddService
(
&
TestRunner
::
Shared
());
}
mojo
::
ServiceProviderPtr
CreateServiceProvider
(
...
...
sky/tools/webkitpy/layout_tests/port/android.py
浏览文件 @
a3c3a632
...
...
@@ -634,9 +634,6 @@ class AndroidPort(base.Port):
def
_path_to_driver
(
self
,
configuration
=
None
):
return
self
.
_build_path_with_configuration
(
configuration
,
self
.
_driver_details
.
apk_name
())
def
_path_to_helper
(
self
):
return
None
def
_path_to_image_diff
(
self
):
return
self
.
_host_port
.
_path_to_image_diff
()
...
...
sky/tools/webkitpy/layout_tests/port/base.py
浏览文件 @
a3c3a632
...
...
@@ -326,11 +326,6 @@ class Port(object):
else
:
_log
.
error
(
''
)
helper_path
=
self
.
_path_to_helper
()
if
helper_path
:
result
=
self
.
_check_file_exists
(
helper_path
,
'layout test helper'
)
and
result
if
self
.
get_option
(
'pixel_tests'
):
result
=
self
.
check_image_diff
(
'To override, invoke with --no-pixel-tests'
)
and
result
...
...
@@ -1407,14 +1402,6 @@ class Port(object):
"""Returns the full path to a built copy of WebCore."""
return
None
def
_path_to_helper
(
self
):
"""Returns the full path to the layout_test_helper binary, which
is used to help configure the system for the test run, or None
if no helper is needed.
This is likely only used by start/stop_helper()."""
return
None
def
_path_to_image_diff
(
self
):
"""Returns the full path to the image_diff binary, or None if it is not available.
...
...
sky/tools/webkitpy/layout_tests/port/linux.py
浏览文件 @
a3c3a632
...
...
@@ -157,6 +157,3 @@ class LinuxPort(base.Port):
def
_path_to_driver
(
self
,
configuration
=
None
):
binary_name
=
self
.
driver_name
()
return
self
.
_build_path_with_configuration
(
configuration
,
binary_name
)
def
_path_to_helper
(
self
):
return
None
sky/tools/webkitpy/layout_tests/port/mac.py
浏览文件 @
a3c3a632
...
...
@@ -91,6 +91,9 @@ class MacPort(base.Port):
def
operating_system
(
self
):
return
'mac'
def
driver_name
(
self
):
return
'SkyShell'
#
# PROTECTED METHODS
#
...
...
@@ -108,9 +111,5 @@ class MacPort(base.Port):
# FIXME: make |configuration| happy with case-sensitive file systems.
return
self
.
_build_path_with_configuration
(
configuration
,
self
.
driver_name
()
+
'.app'
,
'Contents'
,
'MacOS'
,
self
.
driver_name
())
def
_path_to_helper
(
self
):
binary_name
=
'layout_test_helper'
return
self
.
_build_path
(
binary_name
)
def
_path_to_wdiff
(
self
):
return
'wdiff'
return
None
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录