Skip to content

Remove the default perl test runner for the FSharp test suite #1573

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 1 commit into from
Sep 30, 2016
Merged

Remove the default perl test runner for the FSharp test suite #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion TESTGUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The F# tests are split as follows:

### FSharp Suite

This is now compiled using [tests\fsharp\FSharp.Tests.fsproj] to a unit test DLL which acts as a driver script.
This is now compiled using [tests\fsharp\FSharp.Tests.fsproj](tests/fsharp/FSharp.Tests.fsproj) to a unit test DLL which acts as a driver script.

This compiles and executes the `test.fsx` file using some combination of compiler or FSI flags.
If the compilation and execution encounter no errors, the test is considered to have passed.
Expand Down
2 changes: 0 additions & 2 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,14 +418,12 @@ call BuildTestTools.cmd %BUILD_CONFIG_LOWERCASE%

@echo on
if '%TEST_FSHARP_SUITE%' == '1' (
set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER=true
call RunTests.cmd %BUILD_CONFIG_LOWERCASE% fsharp %TEST_TAGS%
@if ERRORLEVEL 1 (
type testresults\FSharpNunit_Error.log
echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWERCASE% fsharp %TEST_TAGS%' failed
goto :failed_tests
)
set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER=
)

if '%TEST_FSHARPQA_SUITE%' == '1' (
Expand Down
30 changes: 0 additions & 30 deletions tests/RunTests.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,36 +153,6 @@ REM ----------------------------------------------------------------------------

:FSHARP

if not '%FSHARP_TEST_SUITE_USE_NUNIT_RUNNER%' == '' (
goto :FSHARP_NUNIT
)

set RESULTFILE=FSharp_Results.log
set FAILFILE=FSharp_Failures.log
set FAILENV=FSharp_Failures

rem Hosted compiler not supported for FSHARP suite
set HOSTED_COMPILER=

where.exe perl > NUL 2> NUL
if errorlevel 1 (
echo Error: perl is not in the PATH
exit /b 1
)

echo perl %~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot %RESULTSDIR% -results %RESULTFILE% -log %FAILFILE% -fail %FAILENV% -cleanup:yes %TTAGS_ARG% %NO_TTAGS_ARG% %PARALLEL_ARG%
perl %~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot %RESULTSDIR% -results %RESULTFILE% -log %FAILFILE% -fail %FAILENV% -cleanup:yes %TTAGS_ARG% %NO_TTAGS_ARG% %PARALLEL_ARG% -savelog:all
)
if errorlevel 1 (
type %RESULTSDIR%\%FAILFILE%
exit /b 1
)
goto :EOF

REM ----------------------------------------------------------------------------

:FSHARP_NUNIT

set FSHARP_TEST_SUITE_CONFIGURATION=%FLAVOR%

set XMLFILE=%RESULTSDIR%\FSharpNunit_Xml.xml
Expand Down