Repository: lucenenet Updated Branches: refs/heads/api-work 99d160ad3 -> b6a7f92b1
build\build.ps1: Updated result paths so the files are output to the release directory, and are kept separate per framework and assembly Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b6a7f92b Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b6a7f92b Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b6a7f92b Branch: refs/heads/api-work Commit: b6a7f92b15fff19711c749c2ce54033620442f21 Parents: 99d160a Author: Shad Storhaug <[email protected]> Authored: Tue Apr 11 15:07:38 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Tue Apr 11 15:07:38 2017 +0700 ---------------------------------------------------------------------- build/build.ps1 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b6a7f92b/build/build.ps1 ---------------------------------------------------------------------- diff --git a/build/build.ps1 b/build/build.ps1 index f22bc82..922ef54 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -3,7 +3,8 @@ [string]$release_directory = "$base_directory\release" [string]$source_directory = "$base_directory" [string]$tools_directory = "$base_directory\lib" - [string]$nuget_package_directory = "$release_directory\packagesource" + [string]$nuget_package_directory = "$release_directory\NuGetPackages" + [string]$test_results_directory = "$release_directory\TestResults" [string]$packageVersion = "1.0.0" [string]$version = "0.0.0" @@ -91,13 +92,13 @@ task Test -description "This task runs the tests" { foreach ($testProject in $testProjects) { + $testName = $testProject.Directory.Name $projectDirectory = $testProject.DirectoryName Write-Host "Directory: $projectDirectory" -ForegroundColor Green if ($framework.StartsWith("netcore")) { $testExpression = "dotnet.exe test '$projectDirectory\project.json' --configuration $configuration --no-build" } else { - $testName = $testProject.Directory.Name $binaryRoot = "$projectDirectory\bin\$configuration\$framework" $testBinary = "$binaryRoot\win7-x64\$testName.dll" @@ -111,7 +112,10 @@ task Test -description "This task runs the tests" { $testExpression = "$tools_directory\NUnit\NUnit.ConsoleRunner.3.5.0\tools\nunit3-console.exe $testBinary --teamcity" } - $testExpression = "$testExpression --result:$projectDirectory\TestResult.xml" + $testResultDirectory = "$test_results_directory\$framework\$testName" + Ensure-Directory-Exists $testResultDirectory + + $testExpression = "$testExpression --result:$testResultDirectory\TestResult.xml" if ($where -ne $null -and (-Not [System.String]::IsNullOrEmpty($where))) { $testExpression = "$testExpression --where $where"
