Skip to content

Commit

Permalink
Integrate PropertyTests into Unittests
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Jul 29, 2015
1 parent 1b49c26 commit 8c83c8f
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 351 deletions.
1 change: 0 additions & 1 deletion DEVGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ 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: 0 additions & 3 deletions TESTGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ 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 @@ -103,8 +102,6 @@ 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: 0 additions & 6 deletions appveyor-build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ 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 @@ -97,9 +94,6 @@ 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
11 changes: 0 additions & 11 deletions src/FSharpSource.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@
<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
19 changes: 0 additions & 19 deletions src/fsharp-library-propertytests-build.proj

This file was deleted.

Loading

0 comments on commit 8c83c8f

Please sign in to comment.