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

Merge pull request #2579 from dotnet/prkrishn/runtimes

Browse source 
Use runtime directory instead of compile directory when running tests
This commit is contained in:
Pranav K 2016-04-19 12:14:20 -07:00
commit 612088cfa8
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/dotnet/commands/dotnet-test/AssemblyUnderTest.cs
View file

@ -26,15 +26,7 @@ namespace Microsoft.DotNet.Tools.Test
_dotentTestParams.BuildBasePath, _dotentTestParams.BuildBasePath,
_dotentTestParams.Output); _dotentTestParams.Output);
var assemblyUnderTest = outputPaths.CompilationFiles.Assembly; return outputPaths.RuntimeFiles.Assembly;
if (!string.IsNullOrEmpty(_dotentTestParams.Output) ||
!string.IsNullOrEmpty(_dotentTestParams.BuildBasePath))
{
assemblyUnderTest = outputPaths.RuntimeFiles.Assembly;
}
return assemblyUnderTest;
} }
} }
} }

13
src/dotnet/commands/dotnet-test/Program.cs
View file

@ -7,8 +7,9 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.ProjectModel; using Microsoft.DotNet.ProjectModel;
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.DotNet.Tools.Test namespace Microsoft.DotNet.Tools.Test
{ {
@ -42,7 +43,7 @@ namespace Microsoft.DotNet.Tools.Test
RegisterForParentProcessExit(dotnetTestParams.ParentProcessId.Value); RegisterForParentProcessExit(dotnetTestParams.ParentProcessId.Value);
} }
var projectContexts = CreateProjectContexts(dotnetTestParams.ProjectPath); var projectContexts = CreateProjectContexts(dotnetTestParams.ProjectPath, dotnetTestParams.Runtime);
var projectContext = projectContexts.First(); var projectContext = projectContexts.First();
@ -98,7 +99,7 @@ namespace Microsoft.DotNet.Tools.Test
} }
} }
private static IEnumerable<ProjectContext> CreateProjectContexts(string projectPath) private static IEnumerable<ProjectContext> CreateProjectContexts(string projectPath, string runtime)
{ {
projectPath = projectPath ?? Directory.GetCurrentDirectory(); projectPath = projectPath ?? Directory.GetCurrentDirectory();
@ -112,7 +113,11 @@ namespace Microsoft.DotNet.Tools.Test
throw new InvalidOperationException($"{projectPath} does not exist."); throw new InvalidOperationException($"{projectPath} does not exist.");
} }
return ProjectContext.CreateContextForEachFramework(projectPath); var runtimeIdentifiers = !string.IsNullOrEmpty(runtime) ?
new[] { runtime } :
PlatformServices.Default.Runtime.GetAllCandidateRuntimeIdentifiers();
return ProjectContext.CreateContextForEachFramework(projectPath).Select(context => context.CreateRuntimeContext(runtimeIdentifiers));
} }
} }
} }