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

Commit954a36e

Browse files
authored
Merge pull requestdotnet#4142 from Microsoft/merges/master-to-dev15.6-20171219-080050
Merge master to dev15.6
2 parentsa2c1bc0 +0fe714e commit954a36e

File tree

266 files changed

+1095
-1525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+1095
-1525
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ scripts/*.patch
5858
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
5959
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
6060
/tests/Xnet40-fsharpqa-suite-failures.log.*
61-
/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
62-
/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
61+
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
62+
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
6363
/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
6464
/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
6565
/tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Feature PRs have the following minimum requirements:
113113

114114
- For Visual F# Tools features, include a link to the[Visual F# Tools](https://github.com/microsoft/visualfsharp) issue for the feature.
115115

116-
- For F# Library features, if you have made additions to the FSharp.Core library public surface area, update[the SurfaceArea tests](https://github.com/Microsoft/visualfsharp/tree/fsharp4/src/fsharp/FSharp.Core.Unittests).
116+
- For F# Library features, if you have made additions to the FSharp.Core library public surface area, update[the SurfaceArea tests](https://github.com/Microsoft/visualfsharp/tree/fsharp4/tests/FSharp.Core.UnitTests).
117117

118118
- For F# Language and Library features, you will be asked to submit a speclet for the feature to the[F# Language Design](https://github.com/fsharp/fslang-design) GitHub repository of speclets. In some cases you will only need to do this after your feature is accepted, but for more complex features you may be asked to do this during the review of the feature.
119119

‎FSharp.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsi", "src\fsharp\fsi\Fsi.f
2929
EndProject
3030
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Tests.FSharpSuite","tests\fsharp\FSharp.Tests.FSharpSuite.fsproj","{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
3131
EndProject
32-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Unittests","src\fsharp\FSharp.Compiler.Unittests\FSharp.Compiler.Unittests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
32+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.Unittests","src\fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
3737
EndProject

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ build:
2727
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
2828
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
2929
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30-
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
3131
mkdir -p$(Configuration)/fsharp30/net40/bin
3232
mkdir -p$(Configuration)/fsharp31/net40/bin
3333
mkdir -p$(Configuration)/fsharp40/net40/bin

‎TESTGUIDE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ The F# tests are split as follows:
2525

2626
*[FSharpQA Suite](tests/fsharpqa/Source) - Broad and deep coverage of a variety of compiler, runtime, and syntax scenarios.
2727

28-
*[FSharp.Core.Unittests](src/fsharp/FSharp.Core.Unittests) - Validation of the core F# types and the public surface area of`FSharp.Core.dll`.
28+
*[FSharp.Core.UnitTests](tests/FSharp.Core.UnitTests) - Validation of the core F# types and the public surface area of`FSharp.Core.dll`.
2929

30-
*[FSharp.Compiler.Unittests](src/fsharp/FSharp.Compiler.Unittests) - Validation of compiler internals.
30+
*[FSharp.Compiler.UnitTests](tests/FSharp.Compiler.UnitTests) - Validation of compiler internals.
3131

3232
*[VisualFSharp.UnitTests](vsintegration/tests/unittests) - Visual F# Tools IDE Unit Test Suite
3333
This suite exercises a wide range of behaviors in the F# Visual Studio project system and language service.
@@ -59,7 +59,7 @@ Tags are in the left column, paths to to corresponding test folders are in the r
5959

6060
If you want to re-run a particular test area, the easiest way to do so is to set a temporary tag for that area in test.lst (e.g. "RERUN") and then pass that as an argument to`build.cmd`:`build.cmd test-net40-fsharpqa include RERUN`.
6161

62-
###FSharp.Compiler.Unittests, FSharp.Core.Unittests, VisualFSharp.Unittests
62+
###FSharp.Compiler.UnitTests, FSharp.Core.UnitTests, VisualFSharp.UnitTests
6363

6464
These are all NUnit tests. You can execute these tests individually via the Visual Studio NUnit3 runner
6565
extension or the command line via`nunit3-console.exe`.

‎VisualFSharp.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A
3232
EndProject
3333
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.Salsa","vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj","{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
3434
EndProject
35-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.Unittests","vsintegration\tests\unittests\VisualFSharp.Unittests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
35+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.UnitTests","vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
3636
EndProject
3737
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttribute","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj","{DA39AD38-4A58-47BF-9215-E49768295169}"
3838
EndProject
@@ -76,11 +76,11 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsi", "src\fsharp\fsi\Fsi.f
7676
EndProject
7777
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Tests.FSharpSuite","tests\fsharp\FSharp.Tests.FSharpSuite.fsproj","{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
7878
EndProject
79-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="VisualFSharp.Unittests Support","VisualFSharp.Unittests Support","{3F044931-FB83-4433-B934-AE66AB27B278}"
79+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="VisualFSharp.UnitTests Support","VisualFSharp.UnitTests Support","{3F044931-FB83-4433-B934-AE66AB27B278}"
8080
EndProject
81-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Unittests","src\fsharp\FSharp.Compiler.Unittests\FSharp.Compiler.Unittests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
81+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
8282
EndProject
83-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.Unittests","src\fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
83+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
8484
EndProject
8585
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="VisualFSharp","VisualFSharp","{4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}"
8686
EndProject
@@ -136,7 +136,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TestTP", "tests\service\dat
136136
EndProject
137137
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="ResourceFile","vsintegration\ItemTemplates\ResourceFile\ResourceFile.csproj","{0385564F-07B4-4264-AB8A-17C393E9140C}"
138138
EndProject
139-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Build.UnitTests","src\fsharp\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj","{400FAB03-786E-40CC-85A8-04B0C2869B14}"
139+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Build.UnitTests","tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj","{400FAB03-786E-40CC-85A8-04B0C2869B14}"
140140
EndProject
141141
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PEVerify","tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj","{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
142142
EndProject

‎build-everything.proj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@
5454
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
5555

5656
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
57-
<ProjectsWithNet40Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
58-
<ProjectsWithNet40Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
57+
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
58+
<ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
5959
</ItemGroup>
6060

6161
<ItemGroupCondition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
62-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
63-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
62+
<ProjectsWithCoreClrInclude="tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj"/>
63+
<ProjectsWithCoreClrInclude="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
6464
</ItemGroup>
6565

6666
<ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
67-
<ProjectsWithNet40Include="src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj"/>
67+
<ProjectsWithNet40Include="tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj"/>
6868
</ItemGroup>
6969

7070
<ItemGroupCondition="'$(TEST_NET40_FSHARP_SUITE)'=='1'" >

‎build.cmd‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,6 @@ goto :eof
549549
:havemsbuild
550550
set_nrswitch=/nr:false
551551

552-
ifdefined TF_BUILD (
553-
echo Adding remote 'visualfsharptools' for internal build.
554-
git remote add visualfsharptools https://github.com/Microsoft/visualfsharp.git
555-
git fetch --all
556-
)
557-
558552
setmsbuildflags=%_nrswitch% /nologo
559553
REM set msbuildflags=%_nrswitch% /nologo
560554
set_ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
@@ -881,8 +875,8 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
881875
setOUTPUTARG=--output:"!OUTPUTFILE!"
882876
)
883877
setERRORFILE=!RESULTSDIR!\test-net40-compilerunit-errors.log
884-
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.Unittests.dll"!WHERE_ARG_NUNIT!
885-
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.Unittests.dll"!WHERE_ARG_NUNIT!
878+
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.UnitTests.dll"!WHERE_ARG_NUNIT!
879+
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\..\..\net40\bin\FSharp.Compiler.UnitTests.dll"!WHERE_ARG_NUNIT!
886880

887881
iferrorlevel1 (
888882
echo -----------------------------------------------------------------
@@ -912,11 +906,11 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
912906
setOUTPUTARG=--output:"!OUTPUTFILE!"
913907
)
914908

915-
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.Unittests.dll"!WHERE_ARG_NUNIT!
916-
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.Unittests.dll"!WHERE_ARG_NUNIT!
909+
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
910+
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
917911

918-
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
919-
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
912+
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
913+
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
920914

921915
iferrorlevel1 (
922916
echo -----------------------------------------------------------------
@@ -938,11 +932,11 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
938932
setOUTPUTFILE=!RESULTSDIR!\test-coreclr-coreunit-output.log
939933
setERRORFILE=!RESULTSDIR!\test-coreclr-coreunit-errors.log
940934

941-
echo"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.Unittests\FSharp.Build.Unittests.dll"!WHERE_ARG_NUNIT!
942-
"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.Unittests\FSharp.Build.Unittests.dll"!WHERE_ARG_NUNIT!
935+
echo"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.UnitTests\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
936+
"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.UnitTests\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
943937

944-
echo"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
945-
"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll"!WHERE_ARG_NUNIT!
938+
echo"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.UnitTests\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
939+
"%_dotnetcliexe%""%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.UnitTests\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
946940

947941
ifERRORLEVEL1 (
948942
echo -----------------------------------------------------------------
@@ -992,8 +986,8 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
992986
)
993987

994988
pushd!FSCBINPATH!
995-
echo"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.Unittests.dll"!WHERE_ARG_NUNIT!
996-
"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.Unittests.dll"!WHERE_ARG_NUNIT!
989+
echo"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.UnitTests.dll"!WHERE_ARG_NUNIT!
990+
"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.UnitTests.dll"!WHERE_ARG_NUNIT!
997991
popd
998992

999993
iferrorlevel1 (

‎build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ if [ "$TEST_NET40_COMPILERUNIT_SUITE" = '1' ]; then
643643
OUTPUTARG="--output:\"$OUTPUTFILE\""
644644
fi
645645

646-
if! printeval"mono$NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\"$OUTPUTARG$ERRORARG --work:\"$FSCBINPATH\"\"$FSCBINPATH/../../net40/bin/FSharp.Compiler.Unittests.dll\"$WHERE_ARG_NUNIT";then
646+
if! printeval"mono$NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\"$OUTPUTARG$ERRORARG --work:\"$FSCBINPATH\"\"$FSCBINPATH/../../net40/bin/FSharp.Compiler.UnitTests.dll\"$WHERE_ARG_NUNIT";then
647647
if [-f"$OUTPUTFILE" ];then
648648
echo -----------------------------------------------------------------
649649
cat"$OUTPUTFILE"
@@ -675,7 +675,7 @@ if [ "$TEST_NET40_COREUNIT_SUITE" = '1' ]; then
675675
OUTPUTARG="--output:\"$OUTPUTFILE\""
676676
fi
677677

678-
if! printeval"mono$NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\"$OUTPUTARG$ERRORARG --work:\"$FSCBINPATH\"\"$FSCBINPATH/FSharp.Core.Unittests.dll\"$WHERE_ARG_NUNIT";then
678+
if! printeval"mono$NUNIT3_CONSOLE --verbose --framework:V4.0 --result:\"$XMLFILE;format=nunit3\"$OUTPUTARG$ERRORARG --work:\"$FSCBINPATH\"\"$FSCBINPATH/FSharp.Core.UnitTests.dll\"$WHERE_ARG_NUNIT";then
679679
if [-f"$OUTPUTFILE" ];then
680680
echo -----------------------------------------------------------------
681681
cat"$OUTPUTFILE"
@@ -708,7 +708,7 @@ if [ "$TEST_PORTABLE_COREUNIT_SUITE" = '1' ]; then
708708
OUTPUTARG="--output:\"$OUTPUTFILE\""
709709
fi
710710

711-
if! printeval"mono$NUNIT3_CONSOLE /framework:V4.0 /result=\"$XMLFILE;format=nunit3\"$OUTPUTARG$ERRORARG /work=\"$FSCBINPATH\"\"$FSCBINPATH/../../portable7/bin/FSharp.Core.Unittests.dll\"\"$FSCBINPATH/../../portable47/bin/FSharp.Core.Unittests.dll\"\"$FSCBINPATH/../../portable78/bin/FSharp.Core.Unittests.dll\"\"$FSCBINPATH/../../portable259/bin/FSharp.Core.Unittests.dll\"$WHERE_ARG_NUNIT";then
711+
if! printeval"mono$NUNIT3_CONSOLE /framework:V4.0 /result=\"$XMLFILE;format=nunit3\"$OUTPUTARG$ERRORARG /work=\"$FSCBINPATH\"\"$FSCBINPATH/../../portable7/bin/FSharp.Core.UnitTests.dll\"\"$FSCBINPATH/../../portable47/bin/FSharp.Core.UnitTests.dll\"\"$FSCBINPATH/../../portable78/bin/FSharp.Core.UnitTests.dll\"\"$FSCBINPATH/../../portable259/bin/FSharp.Core.UnitTests.dll\"$WHERE_ARG_NUNIT";then
712712
if [-f"$OUTPUTFILE" ];then
713713
echo -----------------------------------------------------------------
714714
cat"$OUTPUTFILE"
@@ -732,7 +732,7 @@ if [ "$TEST_CORECLR_COREUNIT_SUITE" = '1' ]; then
732732
OUTPUTFILE="$RESULTSDIR/test-coreclr-coreunit-output.log"
733733
ERRORFILE="$RESULTSDIR/test-coreclr-coreunit-errors.log"
734734

735-
if! printeval"$_dotnetexe\"${_scriptdir}tests/testbin/$BUILD_CONFIG/coreclr/FSharp.Core.Unittests/FSharp.Core.Unittests.dll\"$WHERE_ARG_NUNIT";then
735+
if! printeval"$_dotnetexe\"${_scriptdir}tests/testbin/$BUILD_CONFIG/coreclr/FSharp.Core.UnitTests/FSharp.Core.UnitTests.dll\"$WHERE_ARG_NUNIT";then
736736
echo -----------------------------------------------------------------
737737
echo Error: Running tests coreclr-coreunit failed, see logs above-- FAILED
738738
echo -----------------------------------------------------------------

0 commit comments

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