File tree Expand file tree Collapse file tree 3 files changed +1
-33
lines changed
Expand file tree Collapse file tree 3 files changed +1
-33
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ The F# tests are split as follows:
4848
4949### FSharp Suite
5050
51- This is now compiled using [ tests\fsharp\FSharp.Tests.fsproj] to a unit test DLL which acts as a driver script.
51+ 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.
5252
5353This compiles and executes the ` test.fsx ` file using some combination of compiler or FSI flags.
5454If the compilation and execution encounter no errors, the test is considered to have passed.
Original file line number Diff line number Diff line change @@ -418,14 +418,12 @@ call BuildTestTools.cmd %BUILD_CONFIG_LOWERCASE%
418418
419419@ echo on
420420if '%TEST_FSHARP_SUITE% ' == '1' (
421- set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER = true
422421 call RunTests.cmd %BUILD_CONFIG_LOWERCASE% fsharp %TEST_TAGS%
423422 @ if ERRORLEVEL 1 (
424423 type testresults\FSharpNunit_Error.log
425424 echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWERCASE% fsharp %TEST_TAGS% ' failed
426425 goto :failed_tests
427426 )
428- set FSHARP_TEST_SUITE_USE_NUNIT_RUNNER =
429427)
430428
431429if '%TEST_FSHARPQA_SUITE% ' == '1' (
Original file line number Diff line number Diff line change @@ -153,36 +153,6 @@ REM ----------------------------------------------------------------------------
153153
154154:FSHARP
155155
156- if not '%FSHARP_TEST_SUITE_USE_NUNIT_RUNNER% ' == '' (
157- goto :FSHARP_NUNIT
158- )
159-
160- set RESULTFILE = FSharp_Results.log
161- set FAILFILE = FSharp_Failures.log
162- set FAILENV = FSharp_Failures
163-
164- rem Hosted compiler not supported for FSHARP suite
165- set HOSTED_COMPILER =
166-
167- where.exe perl > NUL 2 > NUL
168- if errorlevel 1 (
169- echo Error: perl is not in the PATH
170- exit /b 1
171- )
172-
173- 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%
174- 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
175- )
176- if errorlevel 1 (
177- type %RESULTSDIR% \%FAILFILE%
178- exit /b 1
179- )
180- goto :EOF
181-
182- REM ----------------------------------------------------------------------------
183-
184- :FSHARP_NUNIT
185-
186156set FSHARP_TEST_SUITE_CONFIGURATION = %FLAVOR%
187157
188158set XMLFILE = %RESULTSDIR% \FSharpNunit_Xml.xml
You can’t perform that action at this time.
0 commit comments