Skip to content

Commit

Permalink
Initial implementation of integrated runner as part of framework; add…
Browse files Browse the repository at this point in the history 
…ed nunit.interfaces assembly and adhoco TestRunner executable for testing the framework.

--HG--
branch : runner
rename : solutions/vs2008/nunit.interfaces/nunit.interaces.csproj => solutions/vs2008/nunit.interfaces/nunit.interfaces.csproj
extra : convert_revision : charlie%40nunit.com-20091003004305-73h9p6tj9lg7v53s
  • Loading branch information
Charlie Poole committed Oct 3, 2009
1 parent 02d1674 commit d9fa7db
Show file tree
Hide file tree
Showing 139 changed files with 16,511 additions and 154 deletions.
4 changes: 4 additions & 0 deletions .bzrignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ solutions/vs2005/framework/**/*
solutions/vs2005/tests/**/*
solutions/vs2005/nunitlite/**/*
solutions/vs2005/nunitlite.tests/**/*
solutions/vs2005/nunit.interfaces/**/*
solutions/vs2005/TestRunner/**/*
solutions/vs2005_CF/nunitlite/**/*
solutions/vs2005_CF/nunitlite.tests/**/*
solutions/vs2008/framework/**/*
solutions/vs2008/tests/**/*
solutions/vs2008/nunitlite/**/*
solutions/vs2008/nunitlite.tests/**/*
solutions/vs2008/nunit.interfaces/**/*
solutions/vs2008/TestRunner/**/*
solutions/vs2008_CF/nunitlite/**/*
solutions/vs2008_CF/nunitlite.tests/**/*
GeneratedAssemblyInfo.cs
Expand Down
17 changes: 14 additions & 3 deletions nunit.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,10 @@
<fail if="${runtime.platform=='netcf'}"
message="The full NUnit framework may not be built for netcf"/>

<nant target="build" buildfile="src/interfaces/nunit.interfaces.build"/>
<nant target="nunit" buildfile="src/framework/nunit.framework.build"/>
<nant target="nunit" buildfile="src/tests/nunit.framework.tests.build"/>
<nant target="build" buildfile="src/TestRunner/TestRunner.build"/>

</target>

Expand Down Expand Up @@ -264,8 +266,11 @@ NUNIT_DIR environment variable.
<property name="nunit.options" value=""
unless="${property::exists('nunit.options')}"/>

<!--<property name="nunit.commandline"
value="nunit.framework.tests.dll ${nunit.options} -xml:${result.file}.xml"/>-->

<property name="nunit.commandline"
value="nunit.framework.tests.dll ${nunit.options} -xml:${result.file}.xml"/>
value="nunit.framework.tests.dll ${nunit.options}"/>

</target>

Expand All @@ -278,11 +283,17 @@ NUNIT_DIR environment variable.
<!-- We use exec rather than the nunit2 task because we are testing
a new build of NUnit which is likely not to be included in the Nant build -->

<exec basedir="${nunit.console.dir}"
<!--<exec basedir="${nunit.console.dir}"
workingdir="${current.build.dir}"
program="nunit-console.exe"
managed="strict"
commandline="${nunit.commandline}" />
commandline="${nunit.commandline}" />-->

<exec basedir="${current.build.dir}"
workingdir="${current.build.dir}"
program="TestRunner.exe"
managed="strict"
commandline="${nunit.commandline}" />

</target>

Expand Down
12 changes: 12 additions & 0 deletions solutions/vs2005/NUnitFramework.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunitlite", "nunitlite\nuni
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunitlite.tests", "nunitlite.tests\nunitlite.tests.csproj", "{0FE72EDD-8CDF-4AEA-9F5E-C0621839F44F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.interfaces", "nunit.interfaces\nunit.interfaces.csproj", "{C5FFA3A5-6A0C-44AD-B23F-9A8424136C7B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRunner", "TestRunner\TestRunner.csproj", "{5D2E48F2-5E51-4EA4-BD92-BB93CB3113A2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -31,6 +35,14 @@ Global
{0FE72EDD-8CDF-4AEA-9F5E-C0621839F44F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FE72EDD-8CDF-4AEA-9F5E-C0621839F44F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0FE72EDD-8CDF-4AEA-9F5E-C0621839F44F}.Release|Any CPU.Build.0 = Release|Any CPU
{C5FFA3A5-6A0C-44AD-B23F-9A8424136C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5FFA3A5-6A0C-44AD-B23F-9A8424136C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5FFA3A5-6A0C-44AD-B23F-9A8424136C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5FFA3A5-6A0C-44AD-B23F-9A8424136C7B}.Release|Any CPU.Build.0 = Release|Any CPU
{5D2E48F2-5E51-4EA4-BD92-BB93CB3113A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D2E48F2-5E51-4EA4-BD92-BB93CB3113A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D2E48F2-5E51-4EA4-BD92-BB93CB3113A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D2E48F2-5E51-4EA4-BD92-BB93CB3113A2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
73 changes: 73 additions & 0 deletions solutions/vs2005/TestRunner/TestRunner.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5D2E48F2-5E51-4EA4-BD92-BB93CB3113A2}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestRunner</RootNamespace>
<AssemblyName>TestRunner</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\src\TestRunner\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\..\..\src\TestRunner\CommandLineOptions.cs">
<Link>CommandLineOptions.cs</Link>
</Compile>
<Compile Include="..\..\..\src\TestRunner\Program.cs">
<Link>Program.cs</Link>
</Compile>
<Compile Include="..\..\..\src\TestRunner\ResultSummary.cs">
<Link>ResultSummary.cs</Link>
</Compile>
<Compile Include="..\..\..\src\TestRunner\StackTraceFilter.cs">
<Link>StackTraceFilter.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\framework\nunit.framework.csproj">
<Project>{816F2E66-2A25-4513-B5FA-8ECB4A5647CD}</Project>
<Name>nunit.framework</Name>
</ProjectReference>
<ProjectReference Include="..\nunit.interfaces\nunit.interfaces.csproj">
<Project>{C5FFA3A5-6A0C-44AD-B23F-9A8424136C7B}</Project>
<Name>nunit.interfaces</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading

0 comments on commit d9fa7db

Please sign in to comment.