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

Commitff4a680

Browse files
committed
Merge branch 'master' into fsharp4
Conflicts:README.mdappveyor-build.cmdtests/RunTests.cmd
2 parents0b7bee8 +da4009c commitff4a680

File tree

4 files changed

+37
-41
lines changed

4 files changed

+37
-41
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLi
101101
*.log
102102
*.jrs
103103
*.chk
104-
*.bak
104+
*.bak

‎appveyor-build.cmd‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,79 +18,85 @@ if exist "%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" set
1818
ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe.&&goto :eof
1919

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

2323
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
24-
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :eof
24+
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
2525

2626
:: Build
2727
%_msbuildexe% src\fsharp-proto-build.proj
28-
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :eof
28+
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
2929

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

3333
%_msbuildexe% src/fsharp-library-build.proj /p:Configuration=Release
34-
@if ERRORLEVEL1echo Error: libraryreleasebuild failed&&goto :eof
34+
@if ERRORLEVEL1echo Error: library build failed&&goto :failure
3535

3636
%_msbuildexe% src/fsharp-compiler-build.proj /p:Configuration=Release
37-
@if ERRORLEVEL1echo Error: compiler build failed&&goto :eof
37+
@if ERRORLEVEL1echo Error: compiler build failed&&goto :failure
3838

3939
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
40-
@if ERRORLEVEL1echo Error: library portable47 build failed&&goto :eof
40+
@if ERRORLEVEL1echo Error: library portable47 build failed&&goto :failure
4141

4242
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
43-
@if ERRORLEVEL1echo Error: library portable7 build failed&&goto :eof
43+
@if ERRORLEVEL1echo Error: library portable7 build failed&&goto :failure
4444

4545
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
46-
@if ERRORLEVEL1echo Error: library portable78 build failed&&goto :eof
46+
@if ERRORLEVEL1echo Error: library portable78 build failed&&goto :failure
4747

4848
%_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
49-
@if ERRORLEVEL1echo Error: library portable259 build failed&&goto :eof
49+
@if ERRORLEVEL1echo Error: library portable259 build failed&&goto :failure
50+
5051
%_msbuildexe% src/fsharp-compiler-unittests-build.proj /p:Configuration=Release
51-
@if ERRORLEVEL1echo Error: compiler unittests build failed&&goto :eof
52+
@if ERRORLEVEL1echo Error: compiler unittests build failed&&goto :failure
5253

5354
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
54-
@if ERRORLEVEL1echo Error: library unittests build failed&&goto :eof
55+
@if ERRORLEVEL1echo Error: library unittests build failed&&goto :failure
5556

5657
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
57-
@if ERRORLEVEL1echo Error: library unittests build failed portable47&&goto :eof
58+
@if ERRORLEVEL1echo Error: library unittests build failed portable47&&goto :failure
5859

5960
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
60-
@if ERRORLEVEL1echo Error: library unittests build failed portable7&&goto :eof
61+
@if ERRORLEVEL1echo Error: library unittests build failed portable7&&goto :failure
6162

6263
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
63-
@if ERRORLEVEL1echo Error: library unittests build failed portable78&&goto :eof
64+
@if ERRORLEVEL1echo Error: library unittests build failed portable78&&goto :failure
6465

6566
%_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
66-
@if ERRORLEVEL1echo Error: library unittests build failed portable259&&goto :eof
67-
67+
@if ERRORLEVEL1echo Error: library unittests build failed portable259&&goto :failure
6868

69-
%_msbuildexe% vsintegration\fsharp-vsintegration-build.proj /p:TargetFramework=net40 /p:Configuration=Release
70-
@if ERRORLEVEL1echo Error: VS integration build failed&&goto :eof
69+
%_msbuildexe% vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
70+
@if ERRORLEVEL1echo Error: VS integration build failed&&goto :failure
7171

72-
%_msbuildexe% vsintegration\fsharp-vsintegration-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
73-
@if ERRORLEVEL1echo Error: VS integration unit tests build failed&&goto :eof
72+
%_msbuildexe% vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
73+
@if ERRORLEVEL1echo Error: VS integration unit tests build failed&&goto :failure
7474

7575
@echoon
7676
call src\update.cmd release -ngen
7777

7878
@echoon
7979
call tests\BuildTestTools.cmd release
80-
@if ERRORLEVEL1echo Error: 'tests\BuildTestTools.cmd release' failed&&goto :eof
80+
@if ERRORLEVEL1echo Error: 'tests\BuildTestTools.cmd release' failed&&goto :failure
8181

8282
@echoon
8383
pushd tests
8484

8585
call RunTests.cmd release fsharp Smoke
86-
@if ERRORLEVEL1echo Error: 'RunTests.cmd release fsharp Smoke' failed&&goto :eof
86+
@if ERRORLEVEL1type testresults\fsharp_failures.log&&echo Error: 'RunTests.cmd release fsharp Smoke' failed&&goto :failure
8787

8888
call RunTests.cmd release fsharpqa Smoke
89-
@if ERRORLEVEL1echo Error: 'RunTests.cmd release fsharpqa Smoke' failed&&goto :eof
89+
@if ERRORLEVEL1type testresults\fsharpqa_failures.log&&echo Error: 'RunTests.cmd release fsharpqa Smoke' failed&&goto :failure
9090

9191
call RunTests.cmd release compilerunit
92-
@if ERRORLEVEL1echo Error: 'RunTests.cmd release compilerunit' failed&&goto :eof
92+
@if ERRORLEVEL1echo Error: 'RunTests.cmd release compilerunit' failed&&goto :failure
93+
9394
call RunTests.cmd release coreunit
94-
@if ERRORLEVEL1echo Error: 'RunTests.cmd release coreunit' failed&&goto :eof
95+
@if ERRORLEVEL1echo Error: 'RunTests.cmd release coreunit' failed&&goto :failure
9596

9697
popd
98+
99+
goto :eof
100+
101+
:failure
102+
exit /b1

‎tests/RunTests.cmd‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ set NO_TTAGS_ARG=-nottags:ReqPP,NOOPEN
2727
set_tmp=%4
2828
ifnot '%_tmp%'== ''setNO_TTAGS_ARG=-nottags:ReqPP,%_tmp:"=%
2929

30-
rem Use commented line to enable parallel execution of tests
31-
rem
32-
rem Disabled for APPVEYOR_CI due to anaemic Perl implementation
33-
rem
34-
IFNOTDEFINED APPVEYOR_CI (
35-
setPARALLEL_ARG=-procs:%NUMBER_OF_PROCESSORS%
36-
)
30+
setPARALLEL_ARG=-procs:%NUMBER_OF_PROCESSORS%
3731

3832
rem This can be set to 1 to reduce the number of permutations used and avoid some of the extra-time-consuming tests
3933
setREDUCED_RUNTIME=1
@@ -42,12 +36,7 @@ if "%REDUCED_RUNTIME%" == "1" set NO_TTAGS_ARG=%NO_TTAGS_ARG%,Expensive
4236
rem Set this to 1 in order to use an external compiler host process
4337
rem This only has an effect when running the FSHARPQA tests, but can
4438
rem greatly speed up execution since fsc.exe does not need to be spawned thousands of times
45-
rem
46-
rem Disabled for APPVEYOR_CI due to anaemic Perl implementation
47-
rem
48-
IFNOTDEFINED APPVEYOR_CI (
49-
setHOSTED_COMPILER=1
50-
)
39+
setHOSTED_COMPILER=1
5140

5241
rem path to fsc.exe which will be used by tests
5342
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
@@ -5258,7 +5258,8 @@ module TripleQuoteStrings =
52585258
check"ckjenew-0ecwe3""""Hello ""world""""Hello\"\"world"
52595259
#if INTERACTIVE// FSI prints \r\n or \n depending on PIPE vs FEED so we'll just skip it
52605260
#else
5261-
check"ckjenew-0ecwe4""""Hello
5261+
if System.Environment.GetEnvironmentVariable("APPVEYOR_CI")<>"1"then
5262+
check"ckjenew-0ecwe4""""Hello
52625263
""world""""Hello\r\n\"\"world"
52635264
#endif
52645265
// cehcek there is no escaping...

0 commit comments

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