huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add logic in test infrastructure to get runtime for coreclr on mac

This commit is contained in:
Kirthi Krishnamraju 2015-10-16 10:19:39 -07:00
parent 374526b270
commit 5f4f6194b8
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -99,16 +99,31 @@ namespace Microsoft.AspNet.Server.Testing
protected string PopulateChosenRuntimeInformation() protected string PopulateChosenRuntimeInformation()
{ {
// ex: runtimes/dnx-coreclr-win-x64.1.0.0-rc1-15844/bin string currentRuntimeBinPath = string.Empty;
var currentRuntimeBinPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName); if (TestPlatformHelper.IsMac && DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr)
{
var path = Environment.GetEnvironmentVariable("PATH");
currentRuntimeBinPath = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).
Where(c => c.Contains("dnx-coreclr-darwin") || c.Contains("dnx-mono")).FirstOrDefault();
if (string.IsNullOrWhiteSpace(currentRuntimeBinPath))
{
throw new Exception("Runtime not detected on the machine.");
}
}
else
{
// ex: runtimes/dnx-coreclr-win-x64.1.0.0-rc1-15844/bin
currentRuntimeBinPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
}
Logger.LogInformation($"Current runtime path is : {currentRuntimeBinPath}"); Logger.LogInformation($"Current runtime path is : {currentRuntimeBinPath}");
var targetRuntimeName = new StringBuilder() var targetRuntimeName = new StringBuilder()
.Append("dnx") .Append("dnx")
.Append((DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr) ? "-coreclr" : "-clr") .Append((DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr) ? "-coreclr" : "-clr")
.Append($"-{OSPrefix}") .Append($"-{OSPrefix}")
.Append((DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x86) ? "-x86" : "-x64") .Append((DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x86) ? "-x86" : "-x64")
.ToString(); .ToString();
string targetRuntimeBinPath; string targetRuntimeBinPath;
// Ex: When current runtime is Mono and the tests are being run for CoreClr // Ex: When current runtime is Mono and the tests are being run for CoreClr