huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass the correct configuration to the test runners

This commit is contained in:
Victor Hurdugaci 2016-02-22 09:51:51 -08:00
parent 430a62982e
commit 9b10be8612
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
KoreBuild-dotnet/build/_dotnet-test.shade
View File

@ -10,9 +10,13 @@ dotnet-test
projectFile='' projectFile=''
Required. Path to the test project.json to execute Required. Path to the test project.json to execute
configuration=''
Optional. The configuration to build in. Defaults to 'Debug'.
*/} */}
default configuration = 'Debug'
@{ @{
var projectText = File.ReadAllText(projectFile); var projectText = File.ReadAllText(projectFile);
var project = (JsonObject)Json.Deserialize(projectText); var project = (JsonObject)Json.Deserialize(projectText);
@ -25,13 +29,7 @@ projectFile=''
var projectFolder = Path.GetDirectoryName(projectFile); var projectFolder = Path.GetDirectoryName(projectFile);
var projectName = Path.GetFileName(projectFolder); var projectName = Path.GetFileName(projectFolder);
var noParallelTestProjects = new HashSet<string>(StringComparer.OrdinalIgnoreCase); var testArgs = "--configuration " + configuration;
if (!string.IsNullOrEmpty(NO_PARALLEL_TEST_PROJECTS))
{
noParallelTestProjects.UnionWith(NO_PARALLEL_TEST_PROJECTS.Split((char)','));
}
var testArgs = noParallelTestProjects.Contains(projectName) ? " -parallel none" : "";
var configs = project.ValueAsJsonObject("frameworks"); var configs = project.ValueAsJsonObject("frameworks");
IEnumerable<string> targetFrameworks = configs == null? IEnumerable<string> targetFrameworks = configs == null?

11
KoreBuild-dotnet/build/_k-standard-goals.shade
View File

@ -180,8 +180,8 @@ default NUGET_FEED = 'https://api.nuget.org/v3/index.json'
#xunit-test target='test' if='Directory.Exists("test")' #xunit-test target='test' if='Directory.Exists("test")'
@{ @{
var projectFiles = Files.Include("test/**/project.json").Exclude("**/bin/*/app/project.json").ToList(); var projectFiles = Files.Include("test/**/project.json").Exclude("**/bin/*/app/project.json").ToList();
projectFiles.ForEach(projectFile => XunitTest(projectFile, testParallel: false)); projectFiles.ForEach(projectFile => XunitTest(projectFile, testParallel: false, configuration: Configuration));
projectFiles.ForEach(projectFile => DotnetTest(projectFile, testParallel: false)); projectFiles.ForEach(projectFile => DotnetTest(projectFile, testParallel: false, configuration: Configuration));
projectFiles.ForEach(projectFile => DnxTest(projectFile, testParallel: false)); projectFiles.ForEach(projectFile => DnxTest(projectFile, testParallel: false));
} }
@ -357,11 +357,14 @@ macro name="DotnetPack" projectFile='string' dotnetPackOutputDir='string' config
macro name="DotnetPublish" projectFile='string' outputFolder='string' framework='string' macro name="DotnetPublish" projectFile='string' outputFolder='string' framework='string'
dotnet-publish dotnet-publish
macro name="DotnetPublish" projectFile='string' outputFolder='string' framework='string' configuration='string'
dotnet-publish
macro name="DotnetTest" projectFile='string' testParallel='bool' macro name="DotnetTest" projectFile='string' testParallel='bool' configuration='string'
dotnet-test dotnet-test
macro name="XunitTest" projectFile='string' testParallel='bool' macro name="XunitTest" projectFile='string' testParallel='bool' configuration='string'
xunit-test xunit-test
macro name='Dnx' command='string' dnxDir='string' dnvmUse='string' macro name='Dnx' command='string' dnxDir='string' dnvmUse='string'

6
KoreBuild-dotnet/build/_xunit-test.shade
View File

@ -12,8 +12,12 @@ xunit-test
projectFile='' projectFile=''
Required. Path to the test project.json to execute Required. Path to the test project.json to execute
configuration=''
Optional. The configuration to build in. Defaults to 'Debug'.
*/} */}
default configuration = 'Debug'
@{ @{
if (!string.Equals(KOREBUILD_TEST_SKIPMONO, "1") && !string.Equals(KOREBUILD_TEST_SKIPMONO, "true")) if (!string.Equals(KOREBUILD_TEST_SKIPMONO, "1") && !string.Equals(KOREBUILD_TEST_SKIPMONO, "true"))
{ {
@ -52,7 +56,7 @@ projectFile=''
} }
var publishFolder = Path.Combine(projectFolder, "obj", "testPublish-" + framework); var publishFolder = Path.Combine(projectFolder, "obj", "testPublish-" + framework);
DotnetPublish(projectFile, publishFolder, framework); DotnetPublish(projectFile, publishFolder, framework, configuration);
var runnerExe = "xunit.console.exe"; var runnerExe = "xunit.console.exe";
string runnerFullPath; string runnerFullPath;