Fix TestSdkDeb to run tests against the installed dotnet.
This commit is contained in:
parent
c317c92691
commit
1f8facc7c5
1 changed files with 9 additions and 3 deletions
|
@ -31,10 +31,14 @@
|
|||
<SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
|
||||
|
||||
<DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
|
||||
<DebianInstalledDotnet>/usr/share/dotnet/dotnet</DebianInstalledDotnet>
|
||||
<DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
|
||||
<EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Consumed By Publish -->
|
||||
<ItemGroup>
|
||||
<GeneratedInstallers Include="$(SdkInstallerFile)" />
|
||||
|
@ -89,8 +93,10 @@
|
|||
<Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
|
||||
|
||||
<!-- Run E2E -->
|
||||
<Exec Command="$(DebianInstalledDotnet) test -xml $(DebianTestResultsXmlFile)"
|
||||
WorkingDirectory="$(EndToEndTestDirectory)" />
|
||||
<DotNetTest WorkingDirectory="$(EndToEndTestDirectory)"
|
||||
EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
|
||||
ToolPath="$(DebianInstalledDirectory)"
|
||||
Xml="$(DebianTestResultsXmlFile)" />
|
||||
|
||||
<!-- Remove Packages -->
|
||||
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
|
||||
|
|
Loading…
Reference in a new issue