Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita1c930c

Browse files
committed
Fix fordotnet#145 - Place Log and Results files from tests in sub-folder of 'tests' (changeset 1357956)
1 parent8130b14 commita1c930c

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

‎TESTGUIDE.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ <h3>Running Tests</h3>
352352

353353
<p><code>RunTests.cmd</code> sets a handful of environment variables which allow for the tests to work, then puts together and executes the appropriate command line to start the specified test suite.
354354

355-
<p>All test execution logs and result files will be dropped into the<code>tests</code> folder, and have file names matching<code>FSharp_*.*</code>,<code>FSharpQA_*.*</code>,<code>CoreUnit_*.*</code>,<code>IDEUnit_*.*</code>.
355+
<p>All test execution logs and result files will be dropped into the<code>tests\TestResults</code> folder, and have file names matching<code>FSharp_*.*</code>,<code>FSharpQA_*.*</code>,<code>CoreUnit_*.*</code>,<code>IDEUnit_*.*</code>.
356356

357357
<p>For the FSharp and FSharpQA suites, the list of test areas and their associated "tags" is stored at
358358
<pre>

‎tests/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
FSharp_*
22
FSharpQA_*
3-
CoreUnit_*
3+
CoreUnit_*
4+
TestResults

‎tests/RunTests.cmd‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ rem set HOSTED_COMPILER=1
3333
rem path to fsc.exe which will be used by tests
3434
setFSCBINPATH=%~dp0..\%FLAVOR%\net40\bin
3535

36+
rem folder where test logs/results will be dropped
37+
setRESULTSDIR=%~dp0\TestResults
38+
3639
if /I"%2"=="fsharp" (goto :FSHARP)
3740
if /I"%2"=="fsharpqa" (goto :FSHARPQA)
3841
if /I"%2"=="coreunit" (
@@ -81,8 +84,8 @@ if errorlevel 1 (
8184
exit /b1
8285
)
8386

84-
echo perl%~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot%~dp0 -results%RESULTFILE% -log%FAILFILE% -fail%FAILENV% -cleanup:yes%TTAGS_ARG%%NO_TTAGS_ARG%%PARALLEL_ARG%
85-
perl%~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot%~dp0 -results%RESULTFILE% -log%FAILFILE% -fail%FAILENV% -cleanup:yes%TTAGS_ARG%%NO_TTAGS_ARG%%PARALLEL_ARG%
87+
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%
88+
perl%~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot%RESULTSDIR% -results%RESULTFILE% -log%FAILFILE% -fail%FAILENV% -cleanup:yes%TTAGS_ARG%%NO_TTAGS_ARG%%PARALLEL_ARG%
8689
goto :EOF
8790

8891

@@ -152,8 +155,8 @@ if errorlevel 1 (
152155
)
153156

154157
pushd%~dp0\fsharpqa\source
155-
echo perl%~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot%~dp0 -results%RESULTFILE% -log%FAILFILE% -fail%FAILENV% -cleanup:yes%TTAGS_ARG%%NO_TTAGS_ARG%%PARALLEL_ARG%
156-
perl%~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot%~dp0 -results%RESULTFILE% -log%FAILFILE% -fail%FAILENV% -cleanup:yes%TTAGS_ARG%%NO_TTAGS_ARG%%PARALLEL_ARG%
158+
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%
159+
perl%~dp0\fsharpqa\testenv\bin\runall.pl -resultsroot%RESULTSDIR% -results%RESULTFILE% -log%FAILFILE% -fail%FAILENV% -cleanup:yes%TTAGS_ARG%%NO_TTAGS_ARG%%PARALLEL_ARG%
157160

158161
popd
159162
goto :EOF
@@ -163,15 +166,14 @@ goto :EOF
163166
setXMLFILE=CoreUnit_%coreunitsuffix%_Xml.xml
164167
setOUTPUTFILE=CoreUnit_%coreunitsuffix%_Output.log
165168
setERRORFILE=CoreUnit_%coreunitsuffix%_Error.log
166-
setFILEDIR=%~dp0
167169

168170
where.exe nunit-console.exe>NUL2>NUL
169171
iferrorlevel1 (
170172
echo Error: nunit-console.exe is not in the PATH
171173
exit /b1
172174
)
173-
echo nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%FILEDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
174-
nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%FILEDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
175+
echo nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
176+
nunit-console.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\..\..\%coreunitsuffix%\bin\FSharp.Core.Unittests.dll
175177

176178
goto :EOF
177179

@@ -180,7 +182,6 @@ goto :EOF
180182
setXMLFILE=IDEUnit_Xml.xml
181183
setOUTPUTFILE=IDEUnit_Output.log
182184
setERRORFILE=IDEUnit_Error.log
183-
setFILEDIR=%~dp0
184185

185186
where.exe nunit-console-x86.exe>NUL2>NUL
186187
iferrorlevel1 (
@@ -191,7 +192,7 @@ if errorlevel 1 (
191192
for /f"tokens=*"%%ain ('where.exe nunit-console-x86.exe')do (set nunitlocation=%%~dpa)
192193
xcopy /y"%nunitlocation%\lib\*.dll""%FSCBINPATH%"
193194

194-
echo nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%FILEDIR%%FSCBINPATH%\Unittests.dll
195-
nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%FILEDIR%%FSCBINPATH%\Unittests.dll
195+
echo nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\Unittests.dll
196+
nunit-console-x86.exe /nologo /result=%XMLFILE% /output=%OUTPUTFILE% /err=%ERRORFILE% /work=%RESULTSDIR%%FSCBINPATH%\Unittests.dll
196197

197198
goto :EOF

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp