Skip to content

[WIP] fix tests and enable all of FSHARP and FSHARPQA in appveyor ci #941

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.

Sign up for GitHub

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

Merged
dsyme merged 10 commits into from
Feb 8, 2016
Merged

[WIP] fix tests and enable all of FSHARP and FSHARPQA in appveyor ci #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76a6a67
enable all of fsharpqa in appveyor ci
dsyme Feb 7, 2016
fe4fa89
enable all of fsharpqa in appveyor ci (2)
dsyme Feb 7, 2016
b3e24e9
changes to tests
dsyme Feb 7, 2016
f4da729
fix typecheck\sigs test
dsyme Feb 8, 2016
79a259f
fix printing tests
dsyme Feb 8, 2016
e79d9f9
fix failures in appveyor CI
dsyme Feb 8, 2016
367338d
Merge branch 'fix-tests3' of https://github.com/dsyme/visualfsharp in…
dsyme Feb 8, 2016
000c665
enable fsharp suite too
dsyme Feb 8, 2016
fb5dbce
remove CI tags from tests since all are now run
dsyme Feb 8, 2016
fd84738
reduce FSharp.Core test times and simplify sln
dsyme Feb 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
569 changes: 0 additions & 569 deletions VisualFSharp.sln
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ if /i '%ARG%' == 'ci' (
set TEST_FSHARPQA_SUITE=1
set TEST_VS=0
set TEST_TAGS=
set TEST_TAGS2=CI
)

REM These divide 'ci' into three chunks which can be done in parallel
Expand All @@ -142,32 +141,32 @@ if /i '%ARG%' == 'ci_part1' (
set TEST_PORTABLE259_COREUNIT=1
set TEST_VS=0
set TEST_TAGS=
set TEST_TAGS2=CI
)

if /i '%ARG%' == 'ci_part2' (
set TEST_FSHARP_SUITE=1
set TEST_TAGS=
set TEST_TAGS2=CI
)


if /i '%ARG%' == 'ci_part3' (
set BUILD_PORTABLE47=1
set BUILD_PORTABLE7=1
set BUILD_PORTABLE78=1
set BUILD_PORTABLE259=1
set TEST_FSHARPQA_SUITE=1
set TEST_TAGS=
set TEST_TAGS2=CI
)

if /i '%ARG%' == 'smoke' (
REM Smoke tests are a very small quick subset of tests

set TEST_COMPILERUNIT=0
set TEST_NET40_COREUNIT=0
set TEST_TAGS=Smoke

set TEST_FSHARP_SUITE=1
set TEST_FSHARPQA_SUITE=0
set TEST_TAGS2=Smoke
set TEST_TAGS=Smoke

)

if /i '%ARG%' == 'debug' (
Expand Down Expand Up @@ -344,13 +343,13 @@ set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER=true
%_msbuildexe% fsharp\fsharp.tests.fsproj /p:Configuration=%BUILD_CONFIG%
@if ERRORLEVEL 1 echo Error: fsharp cambridge tests for nunit failed && goto :failure

call RunTests.cmd %BUILD_CONFIG_LOWER% fsharp %TEST_TAGS2%
call RunTests.cmd %BUILD_CONFIG_LOWER% fsharp %TEST_TAGS%
@if ERRORLEVEL 1 type testresults\fsharp_failures.log && echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWER% fsharp %CONF_CAMBRIDGE_SUITE%' failed && goto :failure
set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER=
)

if '%TEST_FSHARPQA_SUITE%' == '1' (
call RunTests.cmd %BUILD_CONFIG_LOWER% fsharpqa %TEST_TAGS2%
call RunTests.cmd %BUILD_CONFIG_LOWER% fsharpqa %TEST_TAGS%
@if ERRORLEVEL 1 type testresults\fsharpqa_failures.log && echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWER% fsharpqa %CONF_QA_SUITE%' failed && goto :failure
)

Expand Down
14 changes: 7 additions & 7 deletions src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ type AsyncModule() =
let dispose(d : #IDisposable) = d.Dispose()

let testErrorAndCancelRace computation =
for _ in 1..100 do
for _ in 1..20 do
let cts = new System.Threading.CancellationTokenSource()
use barrier = new System.Threading.ManualResetEvent(false)
async { cts.Cancel() }
Expand Down Expand Up @@ -291,7 +291,7 @@ type AsyncModule() =
cts.Cancel()
sleep(100)
Assert.IsTrue(isSet())
for _i = 1 to 50 do test()
for _i = 1 to 3 do test()

[<Test>]
member this.``OnCancel.CancelThatWasSignalledBeforeRunningTheComputation``() =
Expand All @@ -317,10 +317,10 @@ type AsyncModule() =
Assert.IsTrue(ok, "Computation should be completed")
Assert.IsFalse(!cancelledWasCalled, "Cancellation handler should not be called")

for _i = 1 to 50 do test()
for _i = 1 to 3 do test()


[<Test>]
[<Test; Category("Expensive")>]
member this.``Async.AwaitWaitHandle does not leak memory`` () =
// This test checks that AwaitWaitHandle does not leak continuations (described in #131),
// We only test the worst case - when the AwaitWaitHandle is already set.
Expand Down Expand Up @@ -352,7 +352,7 @@ type AsyncModule() =
Assert.IsFalse(resource.IsAlive)

// The leak hangs on a race condition which is really hard to trigger in F# 3.0, hence the 100000 runs...
for _ in 1..100 do tryToLeak()
for _ in 1..10 do tryToLeak()

[<Test>]
member this.``AwaitWaitHandle.DisposedWaitHandle2``() =
Expand Down Expand Up @@ -415,7 +415,7 @@ type AsyncModule() =
testErrorAndCancelRace (Async.Sleep (-5))

#if !(FSHARP_CORE_PORTABLE || FSHARP_CORE_NETCORE_PORTABLE)
[<Test; Category("CHOICE")>]
[<Test; Category("Expensive")>] // takes 3 minutes!
member this.``Async.Choice specification test``() =
Check.QuickThrowOnFailure (normalize >> runChoice)
#endif
Expand Down Expand Up @@ -562,7 +562,7 @@ type AsyncModule() =
try cts.Cancel() with _ -> ()
System.Threading.Thread.Sleep 1500
printfn "===="
for i = 1 to 20 do test()
for i = 1 to 3 do test()
Assert.AreEqual(0, !okCount)
Assert.AreEqual(0, !errCount)
#endif
Expand Down
16 changes: 8 additions & 8 deletions tests/RunTests.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ set XMLFILE=FSharpNunit_Xml.xml
set OUTPUTFILE=FSharpNunit_Output.log
set ERRORFILE=FSharpNunit_Error.log

echo "%NUNIT3_CONSOLE%" /verbose "%FSCBINPATH%\..\..\net40\bin\FSharp.Tests.FSharp.dll" --framework:V4.0 %TTAGS_NUNIT_WHERE% --work="%FSCBINPATH%" --output="%OUTPUTFILE%" --err="%ERRORFILE%" --result="%XMLFILE%"
"%NUNIT3_CONSOLE%" /verbose "%FSCBINPATH%\..\..\net40\bin\FSharp.Tests.FSharp.dll" --framework:V4.0 %TTAGS_NUNIT_WHERE% --work="%FSCBINPATH%" --output="%OUTPUTFILE%" --err="%ERRORFILE%" --result="%XMLFILE%"
echo "%NUNIT3_CONSOLE%" --verbose "%FSCBINPATH%\..\..\net40\bin\FSharp.Tests.FSharp.dll" --framework:V4.0 %TTAGS_NUNIT_WHERE% --work:"%FSCBINPATH%" --output:"%OUTPUTFILE%;format=nunit2" --err:"%ERRORFILE%" --result:"%XMLFILE%"
"%NUNIT3_CONSOLE%" --verbose "%FSCBINPATH%\..\..\net40\bin\FSharp.Tests.FSharp.dll" --framework:V4.0 %TTAGS_NUNIT_WHERE% --work:"%FSCBINPATH%" --output:"%OUTPUTFILE%;format=nunit2" --err:"%ERRORFILE%" --result:"%XMLFILE%"

call :UPLOAD_XML "%XMLFILE%"
goto :EOF
Expand Down Expand Up @@ -261,8 +261,8 @@ set XMLFILE=%RESULTSDIR%\CoreUnit_%coreunitsuffix%_Xml.xml
set OUTPUTFILE=%RESULTSDIR%\CoreUnit_%coreunitsuffix%_Output.log
set ERRORFILE=%RESULTSDIR%\CoreUnit_%coreunitsuffix%_Error.log

echo "%NUNIT3_CONSOLE%" /verbose /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll"
"%NUNIT3_CONSOLE%" /verbose /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll"
echo "%NUNIT3_CONSOLE%" --verbose --framework:V4.0 %TTAGS_NUNIT_WHERE% --result:"%XMLFILE%;format=nunit2" --output:"%OUTPUTFILE%" --err:"%ERRORFILE%" --work:"%FSCBINPATH%" "%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll"
"%NUNIT3_CONSOLE%" --verbose --framework:V4.0 %TTAGS_NUNIT_WHERE% --result:"%XMLFILE%;format=nunit2" --output:"%OUTPUTFILE%" --err:"%ERRORFILE%" --work:"%FSCBINPATH%" "%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll"

call :UPLOAD_XML "%XMLFILE%"

Expand All @@ -274,8 +274,8 @@ set XMLFILE=%RESULTSDIR%\CompilerUnit_%compilerunitsuffix%_Xml.xml
set OUTPUTFILE=%RESULTSDIR%\CompilerUnit_%compilerunitsuffix%_Output.log
set ERRORFILE=%RESULTSDIR%\CompilerUnit_%compilerunitsuffix%_Error.log

echo "%NUNIT3_CONSOLE%" /verbose /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll"
"%NUNIT3_CONSOLE%" /verbose /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll"
echo "%NUNIT3_CONSOLE%" --verbose --framework:V4.0 %TTAGS_NUNIT_WHERE% --result:"%XMLFILE%;format=nunit2" --output:"%OUTPUTFILE%" --err:"%ERRORFILE%" --work:"%FSCBINPATH%" "%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll"
"%NUNIT3_CONSOLE%" --verbose --framework:V4.0 %TTAGS_NUNIT_WHERE% --result:"%XMLFILE%;format=nunit2" --output:"%OUTPUTFILE%" --err:"%ERRORFILE%" --work:"%FSCBINPATH%" "%FSCBINPATH%\..\..\%compilerunitsuffix%\bin\FSharp.Compiler.Unittests.dll"

call :UPLOAD_XML "%XMLFILE%"

Expand All @@ -288,8 +288,8 @@ set OUTPUTFILE=%RESULTSDIR%\IDEUnit_Output.log
set ERRORFILE=%RESULTSDIR%\IDEUnit_Error.log

pushd %FSCBINPATH%
echo "%NUNIT3_CONSOLE%" /verbose --x86 /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\VisualFSharp.Unittests.dll"
"%NUNIT3_CONSOLE%" /verbose --x86 /framework:V4.0 /result="%XMLFILE%;format=nunit2" /output="%OUTPUTFILE%" /err="%ERRORFILE%" /work="%FSCBINPATH%" "%FSCBINPATH%\VisualFSharp.Unittests.dll"
echo "%NUNIT3_CONSOLE%" --verbose --x86 --framework:V4.0 %TTAGS_NUNIT_WHERE% --result:"%XMLFILE%;format=nunit2" --output:"%OUTPUTFILE%" --err:"%ERRORFILE%" --work:"%FSCBINPATH%" "%FSCBINPATH%\VisualFSharp.Unittests.dll"
"%NUNIT3_CONSOLE%" --verbose --x86 --framework:V4.0 %TTAGS_NUNIT_WHERE% --result:"%XMLFILE%;format=nunit2" --output:"%OUTPUTFILE%" --err:"%ERRORFILE%" --work:"%FSCBINPATH%" "%FSCBINPATH%\VisualFSharp.Unittests.dll"
popd
call :UPLOAD_XML "%XMLFILE%"

Expand Down
Loading