[gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/files/, dev-util/nunit/

[Mikhail Pukhlikov]

commit:     8ea0d6ac553157e081cb67b4926f8868ee3b60f7
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 01:22:57 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 01:22:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=8ea0d6ac

remove tests

 dev-util/nunit/build.sh                            |   4 +
 .../nunit-3.0.1-removing-tests-from-nproj.patch    | 208 +++++++++++++++++++++
 .../nunit/files/removing-2.0-compatibiility.patch  |  29 ---
 .../nunit/files/removing-tests-from-nproj.patch    |  12 --
 dev-util/nunit/nunit-3.0.1.ebuild                  |  34 +++-
 5 files changed, 239 insertions(+), 48 deletions(-)

diff --git a/dev-util/nunit/build.sh b/dev-util/nunit/build.sh
new file mode 100755
index 0000000..2553611
--- /dev/null
+++ b/dev-util/nunit/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm -rf /var/tmp/portage/dev-util/nunit-3.0.1
+ebuild nunit-3.0.1.ebuild compile

diff --git a/dev-util/nunit/files/nunit-3.0.1-removing-tests-from-nproj.patch b/dev-util/nunit/files/nunit-3.0.1-removing-tests-from-nproj.patch
new file mode 100644
index 0000000..30cef82
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-removing-tests-from-nproj.patch
@@ -0,0 +1,208 @@
+diff --git a/NUnit.proj b/NUnit.proj
+index de5633b..28f9628 100644
+--- a/NUnit.proj
++++ b/NUnit.proj
+@@ -244,162 +244,6 @@
+   
+   <!-- End Region -->
+ 
+-  <!-- Region Test Targets -->
+-
+-  <Target Name="TestAll" Label="Run tests for all framework builds, the engine and the console"
+-      DependsOnTargets="TestAllFrameworks;TestEngine;TestAddins;TestV2Driver;TestConsole" />
+-    
+-  <Target Name="Test" Label="Run tests for the current framework, engine and console"
+-      DependsOnTargets="TestFramework;TestEngine;TestAddins;TestV2Driver;TestConsole" />
+-
+-  <Target Name="TestAllFrameworks"
+-      Label="Test the framework for the current config and all runtimes">
+-    
+-    <MSBuild Projects="$(MSBuildProjectFullPath)"
+-         Targets="TestFrameworkIfSupported;TestNUnitLiteIfSupported"
+-         Properties="Framework=%(SupportedFrameworks.Identity)"
+-         ContinueOnError="$(ContinueOnFailure)" />
+-    
+-  </Target>
+-
+-  <Target Name="TestFrameworkIfSupported"
+-      Label="Run framework tests conditionally, for use by TestAllFrameworks">
+-
+-    <CallTarget Targets="TestFramework"
+-          ContinueOnError="$(ContinueOnFailure)"
+-          Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight'" />
+-
+-  </Target>
+-
+-  <Target Name="TestNUnitLiteIfSupported"
+-      Label="Run NUnitLite tests conditionally, for use by TestAllFrameworks">
+-
+-    <CallTarget Targets="TestNUnitLite"
+-          ContinueOnError="$(ContinueOnFailure)"
+-          Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight'" />
+-
+-  </Target>
+-
+-  <Target Name="TestFramework" DependsOnTargets="_CreateResultDir"
+-      Label="Run framework tests for a runtime without checking for errors">
+-
+-    <Message Text="******************************************************************" />
+-    <Message Text="* Testing NUnitFramework $(Framework) - $(Configuration)" />
+-    <Message Text="******************************************************************" />
+-
+-    <Error Condition="'$(Runtime)' == 'netcf' Or '$(Runtime)' == 'silverlight'"
+-      Text="The full NUnit framework cannot be tested under $(Runtime)" />
+-
+-    <Exec Condition="'$(Runtime)' == 'portable'" 
+-        WorkingDirectory="$(ConsoleBuildDir)\$(Runtime)" 
+-        Command='$(ManagedExeLauncher) $(ConsoleBuildDir)\$(Runtime)\nunit.portable.tests.exe $(TestOptions)'
+-        ContinueOnError="$(ContinueOnFailure)" />
+-
+-    <Exec Condition="'$(Runtime)' != 'portable'"
+-        WorkingDirectory="$(ConsoleBuildDir)"
+-        Command='$(ManagedExeLauncher) $(ConsoleRunner) $(Framework)/nunit.framework.tests.dll "-result:$(ResultDir)/NUnitFrameworkResult-$(Framework).xml;format=$(ResultFormat)" $(TestOptions)'
+-        ContinueOnError="$(ContinueOnFailure)" />
+-
+-  </Target>
+-
+-  <Target Name="TestNUnitLite" DependsOnTargets="_CreateResultDir"
+-          Label="Run tests of the NUnitLite runner">
+-
+-    <Message Text="******************************************************************" />
+-    <Message Text="* Testing NUnitLite $(Framework) - $(Configuration)" />
+-    <Message Text="******************************************************************" />
+-
+-    <Exec Condition="'$(Runtime)' != 'silverlight' AND '$(Runtime)' != 'portable' "
+-          WorkingDirectory="$(FrameworkBuildDir)"
+-          Command='$(ManagedExeLauncher) nunitlite.tests.exe "-result:$(ResultDir)/NUnitliteResult-$(Framework).xml;format=$(ResultFormat)" $(TestOptions)'
+-          ContinueOnError="$(ContinueOnFailure)" />
+-
+-		<Exec Condition="'$(Runtime)' == 'portable'"
+-          WorkingDirectory="$(FrameworkBuildDir)"
+-          Command='$(ManagedExeLauncher) nunitlite.tests.exe $(TestOptions)'
+-          ContinueOnError="$(ContinueOnFailure)" />
+-
+-  </Target>
+-
+-  <Target Name="TestEngine"
+-      Label ="Run the engine tests"
+-      DependsOnTargets="_CreateResultDir">
+-
+-    <Message Text="******************************************************************" />
+-    <Message Text="* Testing the NUnit Engine - $(Configuration)" />
+-    <Message Text="******************************************************************" />
+-
+-    <Exec WorkingDirectory="$(EngineBuildDir)"
+-        Command='$(ManagedExeLauncher) $(ConsoleRunner) nunit.engine.tests.dll "-result:$(ResultDir)/EngineResult.xml;format=$(ResultFormat)" $(TestOptions)'
+-        ContinueOnError="$(ContinueOnFailure)"/>
+-
+-  </Target>
+-
+-  <Target Name="TestAddins"
+-      Label ="Run the addin tests"
+-      DependsOnTargets="_CreateResultDir">
+-
+-    <Message Text="******************************************************************" />
+-    <Message Text="* Testing the Engine Addins - $(Configuration)" />
+-    <Message Text="******************************************************************" />
+-
+-    <Exec WorkingDirectory="$(EngineBuildDir)"
+-        Command='$(ManagedExeLauncher) $(ConsoleRunner) addins/tests/addin-tests.dll "-result:$(ResultDir)/AddinResult.xml;format=$(ResultFormat)" $(TestOptions)'
+-        ContinueOnError="$(ContinueOnFailure)"/>
+-
+-  </Target>
+-
+-  <Target Name="TestV2Driver"
+-    Label = "Run tests of the NUnit V2 Driver"
+-    DependsOnTargets="_CreateResultDir">
+-
+-    <Message Text="******************************************************************" />
+-    <Message Text="* Testing the NUnit V2 Driver - $(Configuration)" />
+-    <Message Text="******************************************************************" />
+-    
+-    <Exec WorkingDirectory="$(EngineBuildDir)"
+-      Command='$(ManagedExeLauncher) $(ConsoleRunner) addins/v2-tests/nunit.v2.driver.tests.dll "-result:$(ResultDir)/V2DriverResult.xml;format=$(ResultFormat)"  $(TestOptions)'
+-      ContinueOnError="$(ContinueOnFailure)"/>
+-    
+-  </Target>
+-  
+-  <Target Name="TestConsole"
+-      Label="Run the console tests"
+-      DependsOnTargets="_CreateResultDir">
+-    
+-    <Message Text="******************************************************************" />
+-    <Message Text="* Testing the Console Runner - $(Configuration)" />
+-    <Message Text="******************************************************************" />
+-    
+-    <Exec WorkingDirectory="$(ConsoleBuildDir)"
+-        Command='$(ManagedExeLauncher) $(ConsoleRunner) nunit3-console.tests.dll "-result:$(ResultDir)/ConsoleResult.xml;format=$(ResultFormat)" $(TestOptions)'
+-        ContinueOnError="$(ContinueOnFailure)" />
+-    
+-  </Target>
+-  
+-  <Target Name="_CreateResultDir">
+-    
+-    <MakeDir Directories="$(ResultDir)"  Condition="!Exists('$(ResultDir)')"/>
+-    
+-  </Target>
+-  
+-  <!-- End Region -->
+-
+-  <!-- Region Coverage Targets -->
+-
+-  <Target Name="TestCoverage">
+-    <CallTarget Targets="_NUnitCoverage" Condition="'$(Runtime)' != 'netcf'"></CallTarget>
+-  </Target>
+-  
+-  <Target Name="_NUnitCoverage">
+-    <Error Condition="'$(Runtime)' == 'netcf'" Text="The full NUnit framework cannot be tested under $(Runtime)"></Error>
+-    <Exec WorkingDirectory="$(FrameworkBuildDir)"
+-        Command='$(ManagedExeLauncher) $(PartCoverDir)\PartCover.exe --target "$(ConsoleRunner)" --target-args "$(Framework)/nunit.framework.tests.dll $(TestOptions)" --include [nunit.framework]* --output NUnitTestCoverage.xml'>
+-    </Exec>
+-  </Target>
+-  
+-  <!-- End Region -->
+-  
+   <!-- Region Packaging Targets -->
+   
+   <!-- *********************************************************************** -->
+@@ -691,13 +535,6 @@
+     <NUnitProjects Include="$(FrameworkSrcDir)\nunitlite.runner\nunitlite.runner-$(ProjectSuffix).csproj"></NUnitProjects>
+     <NUnitProjects Include="$(FrameworkSrcDir)\mock-assembly\mock-nunit-assembly-$(ProjectSuffix).csproj"
+       Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight'"></NUnitProjects>
+-    <NUnitProjects Include="$(FrameworkSrcDir)\testdata\nunit.testdata-$(ProjectSuffix).csproj"></NUnitProjects>
+-		<NUnitProjects Include="$(FrameworkSrcDir)\nunit.portable.tests\nunit.portable.tests.csproj"
+-      Condition="'$(Runtime)' == 'portable'"></NUnitProjects>
+-    <NUnitProjects Include="$(FrameworkSrcDir)\slow-tests\slow-nunit-tests-$(ProjectSuffix).csproj"
+-      Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight' And '$(Runtime)' != 'portable'"></NUnitProjects>
+-    <NUnitProjects Include="$(FrameworkSrcDir)\tests\nunit.framework.tests-$(ProjectSuffix).csproj"></NUnitProjects>
+-    <NUnitProjects Include="$(FrameworkSrcDir)\nunitlite.tests\nunitlite.tests-$(ProjectSuffix).csproj"></NUnitProjects>
+   </ItemGroup>
+   
+   <ItemGroup Label="Projects for building the engine">
+@@ -705,26 +542,15 @@
+     <EngineProjects Include="$(EngineSrcDir)\nunit.engine.api\nunit.engine.api.csproj" />
+     <EngineProjects Include="$(EngineSrcDir)\nunit.engine\nunit.engine.csproj" />
+     <EngineProjects Include="$(EngineSrcDir)\nunit-agent\nunit-agent.csproj" />
+-    <EngineProjects Include="$(EngineSrcDir)\nunit-agent\nunit-agent-x86.csproj" />
+ 
+-    <!-- Test Assemblies -->
+-    <EngineProjects Include="$(EngineSrcDir)\nunit.engine.tests\nunit.engine.tests.csproj" />  
+-    
+     <!-- Addins -->
+     <EngineProjects Include="$(AddinSrcDir)\nunit-project-loader\nunit-project-loader.csproj" />
+     <EngineProjects Include="$(AddinSrcDir)\vs-project-loader\vs-project-loader.csproj" />
+     <EngineProjects Include="$(AddinSrcDir)\nunit-v2-result-writer\nunit-v2-result-writer.csproj" />
+-    <EngineProjects Include="$(AddinSrcDir)\nunit.v2.driver\nunit.v2.driver.csproj" />
+-
+-    <!-- Addin tests -->
+-    <EngineProjects Include="$(AddinSrcDir)\addin-tests\addin-tests.csproj" />
+-    <EngineProjects Include="$(AddinSrcDir)\nunit.v2.driver.tests\nunit.v2.driver.tests.csproj" />
+-
+   </ItemGroup>
+ 
+   <ItemGroup Label="Projects for building the console runner">
+     <ConsoleProjects Include="$(ConsoleSrcDir)\nunit3-console\nunit3-console.csproj" />
+-    <ConsoleProjects Include="$(ConsoleSrcDir)\nunit3-console.tests\nunit3-console.tests.csproj" />
+   </ItemGroup>
+   
+   <!-- End Region -->

diff --git a/dev-util/nunit/files/removing-2.0-compatibiility.patch b/dev-util/nunit/files/removing-2.0-compatibiility.patch
deleted file mode 100644
index 56ff347..0000000
--- a/dev-util/nunit/files/removing-2.0-compatibiility.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/NUnitEngine/mono-addins/Mono.Addins.csproj b/src/NUnitEngine/mono-addins/Mono.Addins.csproj
-index cb09546..7536d46 100644
---- a/src/NUnitEngine/mono-addins/Mono.Addins.csproj
-+++ b/src/NUnitEngine/mono-addins/Mono.Addins.csproj
-@@ -43,24 +41,6 @@
-   </ItemGroup>
-   <ItemGroup>
-     <Compile Include="AssemblyInfo.cs" />
--    <Compile Include="Compatibility\Check.cs" />
--    <Compile Include="Compatibility\Enumerable.cs" />
--    <Compile Include="Compatibility\ExtensionAttribute.cs" />
--    <Compile Include="Compatibility\Funcs.cs" />
--    <Compile Include="Compatibility\Grouping.cs" />
--    <Compile Include="Compatibility\HashPrimeNumbers.cs" />
--    <Compile Include="Compatibility\HashSet.cs" />
--    <Compile Include="Compatibility\IGrouping.cs" />
--    <Compile Include="Compatibility\ILookup_T.cs" />
--    <Compile Include="Compatibility\IOrderedEnumerable_T.cs" />
--    <Compile Include="Compatibility\Lookup.cs" />
--    <Compile Include="Compatibility\OrderedEnumerable.cs" />
--    <Compile Include="Compatibility\OrderedSequence.cs" />
--    <Compile Include="Compatibility\QuickSort.cs" />
--    <Compile Include="Compatibility\SortContext.cs" />
--    <Compile Include="Compatibility\SortDirection.cs" />
--    <Compile Include="Compatibility\SortSequenceContext.cs" />
--    <Compile Include="Compatibility\Tuple.cs" />
-     <Compile Include="Mono.Addins\ExtensionNode.cs" />
-     <Compile Include="Mono.Addins\ExtensionTree.cs" />
-     <Compile Include="Mono.Addins\TreeNode.cs" />

diff --git a/dev-util/nunit/files/removing-tests-from-nproj.patch b/dev-util/nunit/files/removing-tests-from-nproj.patch
deleted file mode 100644
index 8c117eb..0000000
--- a/dev-util/nunit/files/removing-tests-from-nproj.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/NUnit.proj b/NUnit.proj
-index 31e4dab..a964b88 100644
---- a/NUnit.proj
-+++ b/NUnit.proj
-@@ -659,7 +659,6 @@
- 
-     <!-- Addin tests -->
-     <EngineProjects Include="$(AddinSrcDir)\addin-tests\addin-tests.csproj" />
--    <EngineProjects Include="$(AddinSrcDir)\nunit.v2.driver.tests\nunit.v2.driver.tests.csproj" />
- 
-   </ItemGroup>
- 

diff --git a/dev-util/nunit/nunit-3.0.1.ebuild b/dev-util/nunit/nunit-3.0.1.ebuild
index 75496e5..1f11e9f 100644
--- a/dev-util/nunit/nunit-3.0.1.ebuild
+++ b/dev-util/nunit/nunit-3.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/nunit/${NAME}"
 
 EGIT_COMMIT="dd39deaa2c805783cb069878b58b0447d0849849"
 SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${PF}.tar.gz"
-RESTRICT="mirror"
+#RESTRICT="mirror"
 S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 
 SLOT="3"
@@ -34,21 +34,30 @@ METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
 
 src_prepare() {
 	chmod -R +rw "${S}" || die
-	#epatch "${FILESDIR}/removing-tests.patch"
-	epatch "${FILESDIR}/removing-tests-from-nproj.patch"
-	epatch "${FILESDIR}/removing-2.0-compatibiility.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-removing-tests-from-nproj.patch"
 	enuget_restore "${METAFILETOBUILD}"
+
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+	sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
+	sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
+	sed -i 's#\\#/#g' "${S}/nuget/"*.nuspec || die
+	sed -i "s#\${package.version}#$(get_version_component_range 1-3)#g" "${S}/nuget/"*.nuspec || die
+	sed -i "s#\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
+	sed -i "s#\${current.build.dir}#bin/${DIR}#g" "${S}/nuget/"*.nuspec || die
 	default
 }
 
 src_compile() {
 	exbuild "${METAFILETOBUILD}"
-	enuspec "${FILESDIR}/${PN}.nuspec"
-	# PN = Package name, for example vim.
+	enuspec "${S}/nuget/nunit.nuspec"
+	enuspec "${S}/nuget/nunit.runners.nuspec"
 }
 
 src_install() {
-	DIR=""
 	if use debug; then
 		DIR="Debug"
 	else
@@ -67,6 +76,16 @@ src_install() {
 #	dobin ${FILESDIR}/nunit-console
 	make_wrapper nunit "mono ${SLOTTEDDIR}/nunit-console.exe"
 
+	if use gac; then
+		if use debug; then
+			DIR="Debug"
+		else
+			DIR="Release"
+		fi
+
+		egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll"
+	fi
+
 	if use doc; then
 #		dodoc ${WORKDIR}/doc/*.txt
 #		dohtml ${WORKDIR}/doc/*.html
@@ -76,4 +95,5 @@ src_install() {
 	fi
 
 	enupkg "${WORKDIR}/NUnit.3.0.0.nupkg"
+	enupkg "${WORKDIR}/NUnit.Runners.$(get_version_component_range 1-3).nupkg"
 }