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

Fix EndToEnd Tests for portable build and publish

Browse source
This commit is contained in:
Bryan Thornbury 2016-03-17 15:24:36 -07:00
parent 6c17d0e29c
commit d878331a5e
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
View file

@ -107,10 +107,19 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string expectedOutput) string expectedOutput)
{ {
var executablePath = Path.Combine(outputDir, executableName); var executablePath = Path.Combine(outputDir, executableName);
var args = new List<string>();
if (IsPortable(executablePath))
{
args.Add(ArgumentEscaper.EscapeSingleArg(executablePath));
var muxer = new Muxer();
executablePath = muxer.MuxerPath;
}
var executableCommand = new TestCommand(executablePath); var executableCommand = new TestCommand(executablePath);
var result = executableCommand.ExecuteWithCapturedOutput(""); var result = executableCommand.ExecuteWithCapturedOutput(string.Join(" ", args));
result.Should().HaveStdOut(expectedOutput); result.Should().HaveStdOut(expectedOutput);
result.Should().NotHaveStdErr(); result.Should().NotHaveStdErr();
@ -141,5 +150,15 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return executablePath; return executablePath;
} }
private bool IsPortable(string executablePath)
{
var executableDir = Path.GetDirectoryName(executablePath);
var runtimeConfig = Directory.EnumerateFiles(executableDir)
.FirstOrDefault(x => x.EndsWith("runtimeconfig.json"));
return runtimeConfig != null;
}
} }
} }