зеркало из https://github.com/dotnet/fsharp.git
update perl test runner (#7779)
This commit is contained in:
Родитель
c18e1780b3
Коммит
cdc391e4da
|
@ -46,7 +46,7 @@ There are also negative tests checking code expected to fail compilation. See no
|
|||
|
||||
### FSharpQA Suite
|
||||
|
||||
The FSharpQA suite relies on [Perl](http://www.perl.org/get.html), StrawberryPerl64 package from nuget is used automatically by the test suite.
|
||||
The FSharpQA suite relies on [Perl](http://www.perl.org/get.html), StrawberryPerl package from nuget is used automatically by the test suite.
|
||||
|
||||
These tests use the `RunAll.pl` framework to execute, however the easiest way to run them is via the `build.cmd` script, see [usage examples](https://github.com/Microsoft/visualfsharp/blob/master/build.cmd#L31).
|
||||
|
||||
|
|
|
@ -359,7 +359,8 @@ try {
|
|||
$resultsLog = "test-net40-fsharpqa-results.log"
|
||||
$errorLog = "test-net40-fsharpqa-errors.log"
|
||||
$failLog = "test-net40-fsharpqa-errors"
|
||||
$perlExe = "$env:USERPROFILE\.nuget\packages\StrawberryPerl64\5.22.2.1\Tools\perl\bin\perl.exe"
|
||||
$perlPackageRoot = "$env:USERPROFILE\.nuget\packages\StrawberryPerl\5.28.0.1";
|
||||
$perlExe = "$perlPackageRoot\bin\perl.exe"
|
||||
Create-Directory $resultsRoot
|
||||
UpdatePath
|
||||
$env:HOSTED_COMPILER = 1
|
||||
|
@ -367,6 +368,7 @@ try {
|
|||
$env:FSCOREDLLPATH = "$ArtifactsDir\bin\fsc\$configuration\net472\FSharp.Core.dll"
|
||||
$env:LINK_EXE = "$RepoRoot\tests\fsharpqa\testenv\bin\link\link.exe"
|
||||
$env:OSARCH = $env:PROCESSOR_ARCHITECTURE
|
||||
$env:PERL5LIB = "$perlPackageRoot\vendor\lib"
|
||||
Exec-Console $perlExe """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS"
|
||||
Pop-Location
|
||||
}
|
||||
|
|
|
@ -182,7 +182,7 @@
|
|||
<NUnitLiteVersion>3.11.0</NUnitLiteVersion>
|
||||
<NunitXmlTestLoggerVersion>2.1.36</NunitXmlTestLoggerVersion>
|
||||
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
|
||||
<StrawberryPerl64Version>5.22.2.1</StrawberryPerl64Version>
|
||||
<StrawberryPerlVersion>5.28.0.1</StrawberryPerlVersion>
|
||||
<StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
@ -65,7 +65,6 @@
|
|||
<Compile Include="Compiler\Language\StringConcatOptimizationTests.fs" />
|
||||
<Compile Include="Compiler\Stress\LargeExprTests.fs" />
|
||||
<Compile Include="Compiler\Regressions\ForInDoMutableRegressionTest.fs" />
|
||||
<Content Include="packages.config" />
|
||||
<None Include="app.config" />
|
||||
<None Include="update.base.line.with.actuals.fsx" />
|
||||
|
||||
|
@ -82,7 +81,7 @@
|
|||
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
|
||||
<PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(MicrosoftNETCoreILDAsmVersion)" />
|
||||
<PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)" />
|
||||
<PackageReference Include="StrawberryPerl64" Version="$(StrawberryPerl64Version)" PrivateAssets="all" />
|
||||
<PackageReference Include="StrawberryPerl" Version="$(StrawberryPerlVersion)" ExcludeAssets="all" />
|
||||
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
|
||||
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
|
||||
|
|
|
@ -36,7 +36,7 @@ let runPerl arguments =
|
|||
|
||||
use perlProcess =
|
||||
ProcessStartInfo(
|
||||
FileName = Path.Combine(nugetCache, "StrawberryPerl64", "5.22.2.1", "Tools", "perl", "bin", "perl.exe"),
|
||||
FileName = Path.Combine(nugetCache, "StrawberryPerl", "5.28.0.1", "bin", "perl.exe"),
|
||||
Arguments = (arguments |> Array.map(fun a -> @"""" + a + @"""") |> String.concat " "),
|
||||
WorkingDirectory = Path.Combine(rootFolder, "tests", "fsharpqa", "source"),
|
||||
RedirectStandardOutput = true,
|
||||
|
|
Загрузка…
Ссылка в новой задаче