mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Check bitness of dotnet under test instead of test host process

Browse source
This commit is contained in:
Daniel Plaisted 2018-11-29 21:07:50 -08:00
parent c4452f06c7
commit 7d461295be
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/EndToEnd/ProjectBuildTests.cs
View file

@ -41,7 +41,8 @@ namespace EndToEnd.Tests
var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
if (!string.IsNullOrEmpty(dotnetRoot)) if (!string.IsNullOrEmpty(dotnetRoot))
{ {
runCommand = runCommand.WithEnvironmentVariable(Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)", bool useX86 = RepoDirectoriesProvider.DotnetRidUnderTest.EndsWith("x86", StringComparison.InvariantCultureIgnoreCase);
runCommand = runCommand.WithEnvironmentVariable(useX86 ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT",
dotnetRoot); dotnetRoot);
} }

12
test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
View file

@ -6,6 +6,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Xml.Linq; using System.Xml.Linq;
using FluentAssertions;
using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
@ -16,6 +17,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public readonly static string TestWorkingFolder; public readonly static string TestWorkingFolder;
public readonly static string DotnetUnderTest; public readonly static string DotnetUnderTest;
public readonly static string DotnetRidUnderTest;
static RepoDirectoriesProvider() static RepoDirectoriesProvider()
{ {
@ -58,6 +60,16 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "dotnet", "dotnet" + dotnetExtension); DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "dotnet", "dotnet" + dotnetExtension);
} }
} }
// TODO: Resolve dotnet folder even if DotnetUnderTest doesn't have full path
var sdkFolders = Directory.GetDirectories(Path.Combine(Path.GetDirectoryName(DotnetUnderTest), "sdk"));
sdkFolders.Length.Should().Be(1, "Only one SDK folder is expected in the layout");
var sdkFolder = sdkFolders.Single();
var versionFile = Path.Combine(sdkFolder, ".version");
var lines = File.ReadAllLines(versionFile);
DotnetRidUnderTest = lines[2].Trim();
} }
} }