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

Commitef07f6e

Browse files
committed
Enable hosted compiler and parallel test execution in CI build
closesdotnet#223commit5cc9375Author: latkin <latkin@microsoft.com>Date: Tue Feb 10 10:29:29 2015 -0800 Make sure error cases cause nonzero exit code in CI buildcommit08e9a3cAuthor: latkin <latkin@microsoft.com>Date: Tue Feb 10 10:25:41 2015 -0800 Disable line-ending-dependent test from CIcommitc178eefAuthor: latkin <latkin@microsoft.com>Date: Mon Feb 9 21:27:55 2015 -0800 Dump the failure log if tests don't passcommitd11a3d1Author: latkin <latkin@microsoft.com>Date: Mon Feb 9 21:07:50 2015 -0800 Port over recent updates to build script, so that Perl tests are invokedcommitfb1d37aAuthor: latkin <latkin@microsoft.com>Date: Mon Feb 9 20:35:49 2015 -0800 Enable hosted compiler and parallel test execution in CI build
1 parentce944e6 commitef07f6e

File tree

3 files changed

+38
-45
lines changed

3 files changed

+38
-45
lines changed

‎appveyor-build.cmd‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,83 @@ set APPVEYOR_CI=1
55
:: Check prerequisites
66
set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
77
ifnotexist%_msbuildexe%set_msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
8-
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :eof
8+
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :failure
99

1010
set_ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
11-
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :eof
11+
ifnotexist%_ngenexe%echo Error: Could not find ngen.exe.&&goto :failure
1212

1313
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
14-
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :eof
14+
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
1515

1616
::Build
1717
%_msbuildexe% src\fsharp-proto-build.proj
18-
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :eof
18+
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
1919

2020
%_ngenexe% install Proto\net40\bin\fsc-proto.exe
21-
@if ERRORLEVEL1echo Error: NGen of proto failed&&goto :eof
21+
@if ERRORLEVEL1echo Error: NGen of proto failed&&goto :failure
2222

2323
%_msbuildexe% src/fsharp-library-build.proj /p:Configuration=Release
24-
@if ERRORLEVEL1echo Error: library build failed&&goto :eof
24+
@if ERRORLEVEL1echo Error: library build failed&&goto :failure
2525

2626
%_msbuildexe% src/fsharp-compiler-build.proj /p:Configuration=Release
27-
@if ERRORLEVEL1echo Error: compiler build failed&&goto :eof
28-
29-
REM We don't build new net20 FSharp.Core anymore
30-
REM %_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=net20
31-
REM @if ERRORLEVEL 1 echo Error: library net20 build failed && goto :eof
27+
@if ERRORLEVEL1echo Error: compiler build failed&&goto :failure
3228

3329
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
34-
@if ERRORLEVEL1echo Error: library portable47 build failed&&goto :eof
30+
@if ERRORLEVEL1echo Error: library portable47 build failed&&goto :failure
3531

3632
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
37-
@if ERRORLEVEL1echo Error: library portable7 build failed&&goto :eof
38-
33+
@if ERRORLEVEL1echo Error: library portable7 build failed&&goto :failure
3934

4035
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
41-
@if ERRORLEVEL1echo Error: library portable78 build failed&&goto :eof
36+
@if ERRORLEVEL1echo Error: library portable78 build failed&&goto :failure
4237

4338
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
44-
@if ERRORLEVEL1echo Error: library portable259 build failed&&goto :eof
45-
46-
47-
39+
@if ERRORLEVEL1echo Error: library portable259 build failed&&goto :failure
4840

4941
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
50-
@if ERRORLEVEL1echo Error: library unittests build failed&&goto :eof
42+
@if ERRORLEVEL1echo Error: library unittests build failed&&goto :failure
5143

5244
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
53-
@if ERRORLEVEL1echo Error: library unittests build failed portable47&&goto :eof
45+
@if ERRORLEVEL1echo Error: library unittests build failed portable47&&goto :failure
5446

5547
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
56-
@if ERRORLEVEL1echo Error: library unittests build failed portable7&&goto :eof
48+
@if ERRORLEVEL1echo Error: library unittests build failed portable7&&goto :failure
5749

5850
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
59-
@if ERRORLEVEL1echo Error: library unittests build failed portable78&&goto :eof
51+
@if ERRORLEVEL1echo Error: library unittests build failed portable78&&goto :failure
6052

53+
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
54+
@if ERRORLEVEL1echo Error: library unittests build failed portable259&&goto :failure
55+
56+
%_msbuildexe% vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
57+
@if ERRORLEVEL1echo Error: VS integration build failed&&goto :failure
58+
59+
%_msbuildexe% vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
60+
@if ERRORLEVEL1echo Error: VS integration unit tests build failed&&goto :failure
6161

6262
@echoon
6363
call src\update.cmd release -ngen
6464

6565
@echoon
6666
call tests\BuildTestTools.cmd release
67-
@if ERRORLEVEL1echo Error: 'tests\BuildTestTools.cmd release' failed&&goto :eof
67+
@if ERRORLEVEL1echo Error: 'tests\BuildTestTools.cmd release' failed&&goto :failure
6868

6969
@echoon
7070

7171
pushd tests
7272

73-
REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
74-
REM call RunTests.cmd release fsharp Smoke
75-
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed && goto :eof
73+
call RunTests.cmd release fsharp Smoke
74+
@if ERRORLEVEL1type testresults\fsharp_failures.log&&echo Error: 'RunTests.cmd release fsharp Smoke' failed&&goto :failure
7675

77-
REM Disabled while working out perl problem, see https://github.com/Microsoft/visualfsharp/pull/169
78-
REM call RunTests.cmd release fsharpqa Smoke
79-
REM @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release fsharpqa Smoke' failed && goto :eof
76+
call RunTests.cmd release fsharpqa Smoke
77+
@if ERRORLEVEL1type testresults\fsharpqa_failures.log&&echo Error: 'RunTests.cmd release fsharpqa Smoke' failed&&goto :failure
8078

8179
call RunTests.cmd release coreunit
82-
@if ERRORLEVEL1echo Error: 'RunTests.cmd release coreunit' failed&&goto :eof
80+
@if ERRORLEVEL1echo Error: 'RunTests.cmd release coreunit' failed&&goto :failure
8381

8482
popd
83+
84+
goto :eof
85+
86+
:failure
87+
exit /b1

‎tests/RunTests.cmd‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ set NO_TTAGS_ARG=-nottags:ReqPP
1818
set_tmp=%4
1919
ifnot '%_tmp%'== ''setNO_TTAGS_ARG=-nottags:ReqPP,%_tmp:"=%
2020

21-
rem Use commented line to enable parallel execution of tests
22-
rem
23-
rem Disabled for APPVEYOR_CI due to anaemic Perl implementation
24-
rem
25-
IFNOTDEFINED APPVEYOR_CI (
26-
setPARALLEL_ARG=-procs:%NUMBER_OF_PROCESSORS%
27-
)
21+
setPARALLEL_ARG=-procs:%NUMBER_OF_PROCESSORS%
2822

2923
rem This can be set to 1 to reduce the number of permutations used and avoid some of the extra-time-consuming tests
3024
setREDUCED_RUNTIME=1
@@ -33,12 +27,7 @@ if "%REDUCED_RUNTIME%" == "1" set NO_TTAGS_ARG=%NO_TTAGS_ARG%,Expensive
3327
rem Set this to 1 in order to use an external compiler host process
3428
rem This only has an effect when running the FSHARPQA tests, but can
3529
rem greatly speed up execution since fsc.exe does not need to be spawned thousands of times
36-
rem
37-
rem Disabled for APPVEYOR_CI due to anaemic Perl implementation
38-
rem
39-
IFNOTDEFINED APPVEYOR_CI (
40-
setHOSTED_COMPILER=1
41-
)
30+
setHOSTED_COMPILER=1
4231

4332
rem path to fsc.exe which will be used by tests
4433
setFSCBINPATH=%~dp0..\%FLAVOR%\net40\bin

‎tests/fsharp/core/libtest/test.fsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5037,7 +5037,8 @@ module TripleQuoteStrings =
50375037
check"ckjenew-0ecwe3""""Hello ""world""""Hello\"\"world"
50385038
#if INTERACTIVE// FSI prints \r\n or \n depending on PIPE vs FEED so we'll just skip it
50395039
#else
5040-
check"ckjenew-0ecwe4""""Hello
5040+
if System.Environment.GetEnvironmentVariable("APPVEYOR_CI")<>"1"then
5041+
check"ckjenew-0ecwe4""""Hello
50415042
""world""""Hello\r\n\"\"world"
50425043
#endif
50435044
// cehcek there is no escaping...

0 commit comments

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