Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
9e4be409
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9e4be409
编写于
5月 24, 2016
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11514 from jaredpar/fix
Fix a flaky compiler suite
上级
70e76b2e
f8e69902
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
61 addition
and
29 deletion
+61
-29
src/Compilers/Server/PortableServer/PortableBuildServerController.cs
...rs/Server/PortableServer/PortableBuildServerController.cs
+1
-1
src/Compilers/Server/ServerShared/BuildServerController.cs
src/Compilers/Server/ServerShared/BuildServerController.cs
+1
-1
src/Compilers/Server/VBCSCompiler/DesktopBuildServerController.cs
...ilers/Server/VBCSCompiler/DesktopBuildServerController.cs
+12
-2
src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
...Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
+0
-25
src/Compilers/Server/VBCSCompilerTests/DesktopBuildServerControllerTests.cs
...er/VBCSCompilerTests/DesktopBuildServerControllerTests.cs
+46
-0
src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
...mpilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
+1
-0
未找到文件。
src/Compilers/Server/PortableServer/PortableBuildServerController.cs
浏览文件 @
9e4be409
...
...
@@ -41,7 +41,7 @@ protected override IClientConnectionHost CreateClientConnectionHost(string pipeN
return
connectionHost
;
}
protected
override
TimeSpan
?
GetKeepAliveTimeout
()
protected
internal
override
TimeSpan
?
GetKeepAliveTimeout
()
{
return
null
;
}
...
...
src/Compilers/Server/ServerShared/BuildServerController.cs
浏览文件 @
9e4be409
...
...
@@ -37,7 +37,7 @@ internal int Run(string[] args)
:
RunServer
(
pipeName
,
cancellationToken
:
cancellationTokenSource
.
Token
);
}
protected
abstract
TimeSpan
?
GetKeepAliveTimeout
();
protected
internal
abstract
TimeSpan
?
GetKeepAliveTimeout
();
protected
abstract
string
GetDefaultPipeName
();
...
...
src/Compilers/Server/VBCSCompiler/DesktopBuildServerController.cs
浏览文件 @
9e4be409
...
...
@@ -14,11 +14,21 @@
using
System.Globalization
;
using
Microsoft.CodeAnalysis.CommandLine
;
using
System.Runtime.InteropServices
;
using
System.Collections.Specialized
;
namespace
Microsoft.CodeAnalysis.CompilerServer
{
internal
class
DesktopBuildServerController
:
BuildServerController
{
internal
const
string
KeepAliveSettingName
=
"keepalive"
;
private
readonly
NameValueCollection
_appSettings
;
internal
DesktopBuildServerController
(
NameValueCollection
appSettings
=
null
)
{
_appSettings
=
appSettings
??
ConfigurationManager
.
AppSettings
;
}
protected
override
IClientConnectionHost
CreateClientConnectionHost
(
string
pipeName
)
{
// VBCSCompiler is installed in the same directory as csc.exe and vbc.exe which is also the
...
...
@@ -29,12 +39,12 @@ protected override IClientConnectionHost CreateClientConnectionHost(string pipeN
return
new
NamedPipeClientConnectionHost
(
compilerServerHost
,
pipeName
);
}
protected
override
TimeSpan
?
GetKeepAliveTimeout
()
protected
internal
override
TimeSpan
?
GetKeepAliveTimeout
()
{
try
{
int
keepAliveValue
;
string
keepAliveStr
=
ConfigurationManager
.
AppSettings
[
"keepalive"
];
string
keepAliveStr
=
_appSettings
[
KeepAliveSettingName
];
if
(
int
.
TryParse
(
keepAliveStr
,
NumberStyles
.
Integer
,
CultureInfo
.
InvariantCulture
,
out
keepAliveValue
)
&&
keepAliveValue
>=
0
)
{
...
...
src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
浏览文件 @
9e4be409
...
...
@@ -1300,31 +1300,6 @@ public async Task Utf8OutputInRspFileVbc()
}
}
[
Fact
,
WorkItem
(
1095079
,
"http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1095079"
)]
public
async
Task
ServerRespectsAppConfig
()
{
var
exeConfigPath
=
Path
.
Combine
(
CompilerDirectory
,
CompilerServerExeName
+
".config"
);
var
doc
=
new
XmlDocument
();
using
(
XmlReader
reader
=
XmlReader
.
Create
(
exeConfigPath
,
new
XmlReaderSettings
{
DtdProcessing
=
DtdProcessing
.
Prohibit
,
XmlResolver
=
null
}))
{
doc
.
Load
(
reader
);
}
var
root
=
doc
.
DocumentElement
;
root
.
SelectSingleNode
(
"appSettings/add/@value"
).
Value
=
"1"
;
doc
.
Save
(
exeConfigPath
);
var
proc
=
StartProcess
(
CompilerServerExecutable
,
""
);
await
Task
.
Delay
(
TimeSpan
.
FromSeconds
(
3
)).
ConfigureAwait
(
false
);
// Give 2s leeway
var
exited
=
proc
.
HasExited
;
if
(!
exited
)
{
Kill
(
proc
);
Assert
.
True
(
false
,
"Compiler server did not exit in time"
);
}
}
[
Fact
]
public
void
BadKeepAlive1
()
{
...
...
src/Compilers/Server/VBCSCompilerTests/DesktopBuildServerControllerTests.cs
0 → 100644
浏览文件 @
9e4be409
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System
;
using
System.Collections.Generic
;
using
System.Collections.Specialized
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
using
Xunit
;
namespace
Microsoft.CodeAnalysis.CompilerServer.UnitTests
{
public
class
DesktopBuildServerControllerTests
{
public
sealed
class
GetKeepAliveTimeoutTests
{
private
readonly
NameValueCollection
_appSettings
=
new
NameValueCollection
();
private
readonly
DesktopBuildServerController
_controller
;
public
GetKeepAliveTimeoutTests
()
{
_controller
=
new
DesktopBuildServerController
(
_appSettings
);
}
[
Fact
]
public
void
Simple
()
{
_appSettings
[
DesktopBuildServerController
.
KeepAliveSettingName
]
=
"42"
;
Assert
.
Equal
(
TimeSpan
.
FromSeconds
(
42
),
_controller
.
GetKeepAliveTimeout
());
}
[
Fact
]
public
void
InvalidNumber
()
{
_appSettings
[
DesktopBuildServerController
.
KeepAliveSettingName
]
=
"dog"
;
Assert
.
Equal
(
ServerDispatcher
.
DefaultServerKeepAlive
,
_controller
.
GetKeepAliveTimeout
());
}
[
Fact
]
public
void
NoSetting
()
{
Assert
.
Equal
(
ServerDispatcher
.
DefaultServerKeepAlive
,
_controller
.
GetKeepAliveTimeout
());
}
}
}
}
src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
浏览文件 @
9e4be409
...
...
@@ -120,6 +120,7 @@
<Compile
Include=
"CompilerServerApiTest.cs"
/>
<Compile
Include=
"CompilerServerTests.cs"
/>
<Compile
Include=
"DesktopBuildClientTests.cs"
/>
<Compile
Include=
"DesktopBuildServerControllerTests.cs"
/>
<Compile
Include=
"EndToEndDeterminismTest.cs"
/>
<Compile
Include=
"VBCSCompilerServerTests.cs"
/>
<Compile
Include=
"MockEngine.cs"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录