Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
bea81154
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,发现更多精彩内容 >>
提交
bea81154
编写于
3月 02, 2016
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Factored out some common data
上级
96f2f926
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
15 addition
and
9 deletion
+15
-9
src/Tools/Source/RunTests/Cache/CachingTestExecutor.cs
src/Tools/Source/RunTests/Cache/CachingTestExecutor.cs
+2
-1
src/Tools/Source/RunTests/Cache/WebDataStorage.cs
src/Tools/Source/RunTests/Cache/WebDataStorage.cs
+1
-2
src/Tools/Source/RunTests/Constants.cs
src/Tools/Source/RunTests/Constants.cs
+5
-1
src/Tools/Source/RunTests/ITestExecutor.cs
src/Tools/Source/RunTests/ITestExecutor.cs
+3
-1
src/Tools/Source/RunTests/ProcessTestExecutor.cs
src/Tools/Source/RunTests/ProcessTestExecutor.cs
+2
-1
src/Tools/Source/RunTests/Program.cs
src/Tools/Source/RunTests/Program.cs
+1
-2
src/Tools/Source/RunTests/RunTests.csproj
src/Tools/Source/RunTests/RunTests.csproj
+1
-1
未找到文件。
src/Tools/Source/RunTests/Cache/CachingTestExecutor.cs
浏览文件 @
bea81154
...
@@ -76,7 +76,8 @@ private TestResult Migrate(string assemblyPath, CachedTestResult cachedTestResul
...
@@ -76,7 +76,8 @@ private TestResult Migrate(string assemblyPath, CachedTestResult cachedTestResul
commandLine
:
commandLine
,
commandLine
:
commandLine
,
elapsed
:
TimeSpan
.
FromMilliseconds
(
0
),
elapsed
:
TimeSpan
.
FromMilliseconds
(
0
),
standardOutput
:
cachedTestResult
.
StandardOutput
,
standardOutput
:
cachedTestResult
.
StandardOutput
,
errorOutput
:
cachedTestResult
.
ErrorOutput
);
errorOutput
:
cachedTestResult
.
ErrorOutput
,
isResultFromCache
:
true
);
}
}
private
async
Task
CacheTestResult
(
ContentFile
contentFile
,
TestResult
testResult
)
private
async
Task
CacheTestResult
(
ContentFile
contentFile
,
TestResult
testResult
)
...
...
src/Tools/Source/RunTests/Cache/WebDataStorage.cs
浏览文件 @
bea81154
...
@@ -20,9 +20,8 @@ internal sealed class WebDataStorage : IDataStorage
...
@@ -20,9 +20,8 @@ internal sealed class WebDataStorage : IDataStorage
private
const
string
NameResultsFileName
=
"ResultsFileName"
;
private
const
string
NameResultsFileName
=
"ResultsFileName"
;
private
const
string
NameResultsFileContent
=
"ResultsFileContent"
;
private
const
string
NameResultsFileContent
=
"ResultsFileContent"
;
private
const
string
NameEllapsedSeconds
=
"EllapsedSeconds"
;
private
const
string
NameEllapsedSeconds
=
"EllapsedSeconds"
;
private
const
string
DashboardUriString
=
"http://jdash.azurewebsites.net"
;
private
readonly
RestClient
_restClient
=
new
RestClient
(
DashboardUriString
);
private
readonly
RestClient
_restClient
=
new
RestClient
(
Constants
.
DashboardUriString
);
public
async
Task
AddCachedTestResult
(
ContentFile
contentFile
,
CachedTestResult
testResult
)
public
async
Task
AddCachedTestResult
(
ContentFile
contentFile
,
CachedTestResult
testResult
)
{
{
...
...
src/Tools/Source/RunTests/Constants.cs
浏览文件 @
bea81154
...
@@ -10,6 +10,10 @@ namespace RunTests
...
@@ -10,6 +10,10 @@ namespace RunTests
{
{
internal
static
class
Constants
internal
static
class
Constants
{
{
internal
const
string
ResultsDirectoryName
=
"xUnitResults"
;
internal
static
string
ResultsDirectoryName
=>
"xUnitResults"
;
internal
static
bool
IsJenkinsRun
=>
!
string
.
IsNullOrEmpty
(
Environment
.
GetEnvironmentVariable
(
"JENKINS_URL"
));
internal
static
string
DashboardUriString
=>
"http://jdash.azurewebsites.net"
;
}
}
}
}
src/Tools/Source/RunTests/ITestExecutor.cs
浏览文件 @
bea81154
...
@@ -16,6 +16,7 @@ internal struct TestResult
...
@@ -16,6 +16,7 @@ internal struct TestResult
internal
TimeSpan
Elapsed
{
get
;
}
internal
TimeSpan
Elapsed
{
get
;
}
internal
string
StandardOutput
{
get
;
}
internal
string
StandardOutput
{
get
;
}
internal
string
ErrorOutput
{
get
;
}
internal
string
ErrorOutput
{
get
;
}
internal
bool
IsResultFromCache
{
get
;
}
/// <summary>
/// <summary>
/// Path to the results file. Can be null in the case xunit error'd and did not create one.
/// Path to the results file. Can be null in the case xunit error'd and did not create one.
...
@@ -25,7 +26,7 @@ internal struct TestResult
...
@@ -25,7 +26,7 @@ internal struct TestResult
internal
string
ResultDir
{
get
;
}
internal
string
ResultDir
{
get
;
}
internal
bool
Succeeded
=>
ExitCode
==
0
;
internal
bool
Succeeded
=>
ExitCode
==
0
;
internal
TestResult
(
int
exitCode
,
string
assemblyPath
,
string
resultDir
,
string
resultsFilePath
,
string
commandLine
,
TimeSpan
elapsed
,
string
standardOutput
,
string
errorOutput
)
internal
TestResult
(
int
exitCode
,
string
assemblyPath
,
string
resultDir
,
string
resultsFilePath
,
string
commandLine
,
TimeSpan
elapsed
,
string
standardOutput
,
string
errorOutput
,
bool
isResultFromCache
)
{
{
ExitCode
=
exitCode
;
ExitCode
=
exitCode
;
AssemblyName
=
Path
.
GetFileName
(
assemblyPath
);
AssemblyName
=
Path
.
GetFileName
(
assemblyPath
);
...
@@ -36,6 +37,7 @@ internal TestResult(int exitCode, string assemblyPath, string resultDir, string
...
@@ -36,6 +37,7 @@ internal TestResult(int exitCode, string assemblyPath, string resultDir, string
Elapsed
=
elapsed
;
Elapsed
=
elapsed
;
StandardOutput
=
standardOutput
;
StandardOutput
=
standardOutput
;
ErrorOutput
=
errorOutput
;
ErrorOutput
=
errorOutput
;
IsResultFromCache
=
isResultFromCache
;
}
}
}
}
...
...
src/Tools/Source/RunTests/ProcessTestExecutor.cs
浏览文件 @
bea81154
...
@@ -125,7 +125,8 @@ public async Task<TestResult> RunTestAsync(string assemblyPath, CancellationToke
...
@@ -125,7 +125,8 @@ public async Task<TestResult> RunTestAsync(string assemblyPath, CancellationToke
commandLine
:
commandLine
,
commandLine
:
commandLine
,
elapsed
:
span
,
elapsed
:
span
,
standardOutput
:
standardOutput
,
standardOutput
:
standardOutput
,
errorOutput
:
errorOutput
);
errorOutput
:
errorOutput
,
isResultFromCache
:
false
);
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
...
...
src/Tools/Source/RunTests/Program.cs
浏览文件 @
bea81154
...
@@ -37,8 +37,7 @@ internal static int Main(string[] args)
...
@@ -37,8 +37,7 @@ internal static int Main(string[] args)
// and Jenkins runs by default until we work on this a bit more. Anyone reading this who wants
// and Jenkins runs by default until we work on this a bit more. Anyone reading this who wants
// to try it out should feel free to opt into this.
// to try it out should feel free to opt into this.
IDataStorage
dataStorage
=
new
LocalDataStorage
();
IDataStorage
dataStorage
=
new
LocalDataStorage
();
if
(
StringComparer
.
OrdinalIgnoreCase
.
Equals
(
"REDMOND"
,
Environment
.
UserDomainName
)
||
if
(
StringComparer
.
OrdinalIgnoreCase
.
Equals
(
"REDMOND"
,
Environment
.
UserDomainName
)
||
Constants
.
IsJenkinsRun
)
!
string
.
IsNullOrEmpty
(
Environment
.
GetEnvironmentVariable
(
"JENKINS_URL"
)))
{
{
Console
.
WriteLine
(
"Using web cache"
);
Console
.
WriteLine
(
"Using web cache"
);
dataStorage
=
new
WebDataStorage
();
dataStorage
=
new
WebDataStorage
();
...
...
src/Tools/Source/RunTests/RunTests.csproj
浏览文件 @
bea81154
...
@@ -50,4 +50,4 @@
...
@@ -50,4 +50,4 @@
<ImportGroup
Label=
"Targets"
>
<ImportGroup
Label=
"Targets"
>
<Import
Project=
"..\..\..\..\build\Targets\VSL.Imports.targets"
/>
<Import
Project=
"..\..\..\..\build\Targets\VSL.Imports.targets"
/>
</ImportGroup>
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录