Repository: lucenenet Updated Branches: refs/heads/api-work 85c19d3f9 -> afeca1c47
SWEEP: Switched all test projects to use dotnet-test-nunit-teamcity, a fork which allows use of the --teamcity switch. Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/afeca1c4 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/afeca1c4 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/afeca1c4 Branch: refs/heads/api-work Commit: afeca1c4733ca9e8eead4eaa5de0a1aa3b5d4b0f Parents: 85c19d3 Author: Shad Storhaug <[email protected]> Authored: Fri Apr 21 06:26:19 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Fri Apr 21 06:26:19 2017 +0700 ---------------------------------------------------------------------- build/build.ps1 | 7 ++++--- src/Lucene.Net.Tests.Analysis.Common/project.json | 4 ++-- src/Lucene.Net.Tests.Analysis.Stempel/project.json | 4 ++-- src/Lucene.Net.Tests.Classification/project.json | 4 ++-- src/Lucene.Net.Tests.Codecs/project.json | 8 ++++---- src/Lucene.Net.Tests.Expressions/project.json | 4 ++-- src/Lucene.Net.Tests.Facet/project.json | 4 ++-- src/Lucene.Net.Tests.Grouping/project.json | 4 ++-- src/Lucene.Net.Tests.Highlighter/project.json | 4 ++-- src/Lucene.Net.Tests.Icu/project.json | 4 ++-- src/Lucene.Net.Tests.Join/project.json | 4 ++-- src/Lucene.Net.Tests.Memory/project.json | 4 ++-- src/Lucene.Net.Tests.Misc/project.json | 4 ++-- src/Lucene.Net.Tests.Queries/project.json | 4 ++-- src/Lucene.Net.Tests.QueryParser/project.json | 4 ++-- src/Lucene.Net.Tests.Sandbox/project.json | 4 ++-- src/Lucene.Net.Tests.Spatial/project.json | 4 ++-- src/Lucene.Net.Tests.Suggest/project.json | 4 ++-- src/Lucene.Net.Tests/project.json | 4 ++-- 19 files changed, 42 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/build/build.ps1 ---------------------------------------------------------------------- diff --git a/build/build.ps1 b/build/build.ps1 index 1bfa4b3..62594ad 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -140,10 +140,10 @@ task Test -description "This task runs the tests" { $testExpression = "$tools_directory\NUnit\NUnit.ConsoleRunner.3.5.0\tools\nunit3-console.exe $testBinary" } - #$testResultDirectory = "$test_results_directory\$framework\$testName" - #Ensure-Directory-Exists $testResultDirectory + $testResultDirectory = "$test_results_directory\$framework\$testName" + Ensure-Directory-Exists $testResultDirectory - $testExpression = "$testExpression --result:$projectDirectory\TestResult.xml" + $testExpression = "$testExpression --result:$testResultDirectory\TestResult.xml --teamcity" if ($where -ne $null -and (-Not [System.String]::IsNullOrEmpty($where))) { $testExpression = "$testExpression --where $where" @@ -181,6 +181,7 @@ function Get-Package-Version() { # this is a pre-release - use 3 segment version number with (optional) zero-padded pre-release tag $packageVersion = "$versionPrefix-$versionSuffix$buildCounter" } + return $packageVersion } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Analysis.Common/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/project.json b/src/Lucene.Net.Tests.Analysis.Common/project.json index 78ce2cc..dc4f1b8 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/project.json +++ b/src/Lucene.Net.Tests.Analysis.Common/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Analysis.Common", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Analysis.Common": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NETStandard.Library": "1.6.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "buildOptions": { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Analysis.Stempel/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/project.json b/src/Lucene.Net.Tests.Analysis.Stempel/project.json index 087d45c..8f08eaf 100644 --- a/src/Lucene.Net.Tests.Analysis.Stempel/project.json +++ b/src/Lucene.Net.Tests.Analysis.Stempel/project.json @@ -2,12 +2,12 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Analysis.Stempel", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Analysis.Stempel": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Classification/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Classification/project.json b/src/Lucene.Net.Tests.Classification/project.json index 4ae638a..332c9a2 100644 --- a/src/Lucene.Net.Tests.Classification/project.json +++ b/src/Lucene.Net.Tests.Classification/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Classification", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Analysis.Common": "4.8.0", "Lucene.Net.Classification": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Codecs/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Codecs/project.json b/src/Lucene.Net.Tests.Codecs/project.json index 7a62e73..3f44f16 100644 --- a/src/Lucene.Net.Tests.Codecs/project.json +++ b/src/Lucene.Net.Tests.Codecs/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Codecs", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", - "NUnit": "3.5.0", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Analysis.Common": "4.8.0", "Lucene.Net.Codecs": "4.8.0", - "Lucene.Net.TestFramework": "4.8.0" + "Lucene.Net.TestFramework": "4.8.0", + "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Expressions/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Expressions/project.json b/src/Lucene.Net.Tests.Expressions/project.json index 5ee47cf..e87d841 100644 --- a/src/Lucene.Net.Tests.Expressions/project.json +++ b/src/Lucene.Net.Tests.Expressions/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Expressions", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Expressions": "4.8.0", "Lucene.Net.Queries": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Facet/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/project.json b/src/Lucene.Net.Tests.Facet/project.json index 1656ad5..3e55af3 100644 --- a/src/Lucene.Net.Tests.Facet/project.json +++ b/src/Lucene.Net.Tests.Facet/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Classification", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Facet": "4.8.0", "Lucene.Net.Queries": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Grouping/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Grouping/project.json b/src/Lucene.Net.Tests.Grouping/project.json index b274193..79fb89f 100644 --- a/src/Lucene.Net.Tests.Grouping/project.json +++ b/src/Lucene.Net.Tests.Grouping/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Grouping", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Grouping": "4.8.0", "Lucene.Net.Queries": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Highlighter/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Highlighter/project.json b/src/Lucene.Net.Tests.Highlighter/project.json index 427fd5b..b573866 100644 --- a/src/Lucene.Net.Tests.Highlighter/project.json +++ b/src/Lucene.Net.Tests.Highlighter/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Highlighter", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Highlighter": "4.8.0", "Lucene.Net.Queries": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Icu/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Icu/project.json b/src/Lucene.Net.Tests.Icu/project.json index 31ae099..7d69e17 100644 --- a/src/Lucene.Net.Tests.Icu/project.json +++ b/src/Lucene.Net.Tests.Icu/project.json @@ -2,7 +2,7 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Icu", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net": "4.8.0", "Lucene.Net.Analysis.Common": "4.8.0", "Lucene.Net.Highlighter": "4.8.0", @@ -34,7 +34,7 @@ ] } }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Join/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Join/project.json b/src/Lucene.Net.Tests.Join/project.json index 0ad96cf..14ce7d7 100644 --- a/src/Lucene.Net.Tests.Join/project.json +++ b/src/Lucene.Net.Tests.Join/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Join", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Grouping": "4.8.0", "Lucene.Net.Join": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Memory/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Memory/project.json b/src/Lucene.Net.Tests.Memory/project.json index 58a3f46..b1c17c2 100644 --- a/src/Lucene.Net.Tests.Memory/project.json +++ b/src/Lucene.Net.Tests.Memory/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Memory", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Memory": "4.8.0", "Lucene.Net.QueryParser": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Misc/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Misc/project.json b/src/Lucene.Net.Tests.Misc/project.json index 85aa4c6..01d73d6 100644 --- a/src/Lucene.Net.Tests.Misc/project.json +++ b/src/Lucene.Net.Tests.Misc/project.json @@ -2,12 +2,12 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Misc", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Misc": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Queries/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Queries/project.json b/src/Lucene.Net.Tests.Queries/project.json index a1fab05..876fca7 100644 --- a/src/Lucene.Net.Tests.Queries/project.json +++ b/src/Lucene.Net.Tests.Queries/project.json @@ -2,12 +2,12 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Queries", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Queries": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.QueryParser/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.QueryParser/project.json b/src/Lucene.Net.Tests.QueryParser/project.json index 1fc5602..1bb657e 100644 --- a/src/Lucene.Net.Tests.QueryParser/project.json +++ b/src/Lucene.Net.Tests.QueryParser/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.QueryParser", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Analysis.Common": "4.8.0", "Lucene.Net.QueryParser": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Sandbox/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Sandbox/project.json b/src/Lucene.Net.Tests.Sandbox/project.json index 2373161..70f7ed3 100644 --- a/src/Lucene.Net.Tests.Sandbox/project.json +++ b/src/Lucene.Net.Tests.Sandbox/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Sandbox", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Codecs": "4.8.0", "Lucene.Net.Sandbox": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Spatial/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Spatial/project.json b/src/Lucene.Net.Tests.Spatial/project.json index 86b0f9d..86d93b4 100644 --- a/src/Lucene.Net.Tests.Spatial/project.json +++ b/src/Lucene.Net.Tests.Spatial/project.json @@ -2,13 +2,13 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Spatial", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Spatial": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NETStandard.Library": "1.6.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net403+sl5+win8+wp8+wpa81" ], http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests.Suggest/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Suggest/project.json b/src/Lucene.Net.Tests.Suggest/project.json index d6da7ac..964a920 100644 --- a/src/Lucene.Net.Tests.Suggest/project.json +++ b/src/Lucene.Net.Tests.Suggest/project.json @@ -2,14 +2,14 @@ "version": "4.8.0", "title": "Lucene.Net.Tests.Suggest", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Analysis.Common": "4.8.0", "Lucene.Net.Queries": "4.8.0", "Lucene.Net.Suggest": "4.8.0", "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "imports": "dnxcore50", http://git-wip-us.apache.org/repos/asf/lucenenet/blob/afeca1c4/src/Lucene.Net.Tests/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json index 9ecd1ab..d21a823 100644 --- a/src/Lucene.Net.Tests/project.json +++ b/src/Lucene.Net.Tests/project.json @@ -2,7 +2,7 @@ "version": "4.8.0", "title": "Lucene.Net.Tests", "dependencies": { - "dotnet-test-nunit": "3.4.0-beta-3", + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "Lucene.Net.Codecs": "4.8.0", "Lucene.Net.Facet": "4.8.0", "Lucene.Net.Queries": "4.8.0", @@ -10,7 +10,7 @@ "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "testRunner": "nunit", + "testRunner": "nunit-teamcity", "frameworks": { "netcoreapp1.0": { "buildOptions": {
