Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Collecting all results of the property based tests from the hackday #372

Closed
wants to merge 11 commits into from
Closed
1 change: 1 addition & 0 deletions DEVGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ Prior to a **Release** test run, you need to do **all** of these:
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
msbuild src/fsharp-library-propertytests-build.proj /p:Configuration=Release
src\update.cmd release -ngen
tests\BuildTestTools.cmd release

Expand Down
3 changes: 3 additions & 0 deletions TESTGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RunTests.cmd <debug|release> coreunitportable47
RunTests.cmd <debug|release> coreunitportable7
RunTests.cmd <debug|release> coreunitportable78
RunTests.cmd <debug|release> coreunitportable259
RunTests.cmd <debug|release> coreproperty
RunTests.cmd <debug|release> ideunit
```

Expand Down Expand Up @@ -102,6 +103,8 @@ To build these unit test binaries, from the `src` directory call
- Output binary is `FSharp.Compiler.Unittests.dll`
- `msbuild fsharp-library-unittests-build.proj`
- Output binary is `FSharp.Core.Unittests.dll`
- `msbuild fsharp-library-propertytests-build.proj`
- Output binary is `FSharp.Core.PropertyTests.dll`

You can execute and re-run these tests using any standard NUnit approach - via graphical `nunit.exe` or on the command line via `nunit-console.exe`.

Expand Down
6 changes: 6 additions & 0 deletions appveyor-build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
@if ERRORLEVEL 1 echo Error: library unittests build failed portable259 && goto :failure

%_msbuildexe% src/fsharp-library-propertytests-build.proj /p:Configuration=Release
@if ERRORLEVEL 1 echo Error: library propertytests build failed && goto :failure

%_msbuildexe% vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
@if ERRORLEVEL 1 echo Error: VS integration build failed && goto :failure

Expand Down Expand Up @@ -94,6 +97,9 @@ call RunTests.cmd release compilerunit
call RunTests.cmd release coreunit
@if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunit' failed && goto :failure

call RunTests.cmd release coreproperty
@if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreproperty' failed && goto :failure

popd

goto :eof
Expand Down
3 changes: 2 additions & 1 deletion packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net40" />
<package id="NUnit.Runners" version="2.6.4" />
<package id="FsCheck" version="1.0.4" />
</packages>
16 changes: 15 additions & 1 deletion src/FSharpSource.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@
<StrongNames>true</StrongNames>
</PropertyGroup>
</When>
<When Condition="'$(AssemblyName)' == 'FSharp.Core.PropertyTests'">
<PropertyGroup>
<OtherFlags Condition="'$(TargetFramework)' != 'net20' and $(IsPortableProfile) != 'true'">$(OtherFlags) --version:4.4.0.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'net20'">$(OtherFlags) --version:2.4.0.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'portable7'">$(OtherFlags) --version:3.7.4.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:3.47.4.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'portable78'">$(OtherFlags) --version:3.78.4.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'portable259'">$(OtherFlags) --version:3.259.4.9055</OtherFlags>
<StrongNames>false</StrongNames>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup Condition="'$(SIGN_WITH_MSFT_KEY)' == 'true'">
<OtherFlags>$(OtherFlags) --version:4.4.0.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
Expand Down Expand Up @@ -101,7 +112,10 @@
<NUnitVersion>2.6.4</NUnitVersion>
<NUnitFullVersion>2.6.4.14350</NUnitFullVersion>
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\</NUnitLibDir>
<NunitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.Runners.$(NUnitVersion)\tools\lib\</NunitToolsLibDir>
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.Runners.$(NUnitVersion)\tools\lib\</NUnitToolsLibDir>
<FsCheckVersion>1.0.4</FsCheckVersion>
<FsCheckFullVersion>1.0.4.0</FsCheckFullVersion>
<FsCheckLibDir>$(FSharpSourcesRoot)\..\packages\FsCheck.$(FsCheckVersion)\lib\net45\</FsCheckLibDir>
</PropertyGroup>

<!-- v2.0-specific flags -->
Expand Down
19 changes: 19 additions & 0 deletions src/fsharp-library-propertytests-build.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="4.0">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFramework)'==''">net40</TargetFramework>
</PropertyGroup>

<!-- Core library tests: all except compact framework (no nunit there) -->
<ItemGroup Condition=" '$(TargetFramework)' != 'sl3-wp' and '$(TargetFramework)' != 'sl5'">
<ProjectFiles Include="fsharp/FSharp.Core.PropertyTests/FSharp.Core.PropertyTests.fsproj"/>
</ItemGroup>

<Import Project="root.traversal.targets"/>

<!-- Insert any customizations for targets here -->

</Project>

Loading