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

Add support for building dotnet CLI on RHEL.

Browse source
This commit is contained in:
Sridhar Periyasamy 2016-03-02 16:20:45 -05:00 • committed by Sridhar Periyasamy
parent ab5df03700
commit 3a4ce0a86b
6 changed files with 48 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/EndToEnd/EndToEndTest.cs
View file

@ -83,9 +83,9 @@ namespace Microsoft.DotNet.Tests.EndToEnd
[Fact]
public void TestDotnetBuildNativeRyuJit()
{
if(IsCentOS())
if(IsCentOSorRHEL())
{
Console.WriteLine("Skipping native compilation tests on CentOS - https://github.com/dotnet/cli/issues/453");
Console.WriteLine("Skipping native compilation tests on CentOS/RHEL - https://github.com/dotnet/cli/issues/453");
return;
}
@ -105,9 +105,9 @@ namespace Microsoft.DotNet.Tests.EndToEnd
[Fact]
public void TestDotnetBuildNativeCpp()
{
if(IsCentOS())
if(IsCentOSorRHEL())
{
Console.WriteLine("Skipping native compilation tests on CentOS - https://github.com/dotnet/cli/issues/453");
Console.WriteLine("Skipping native compilation tests on CentOS/RHEL - https://github.com/dotnet/cli/issues/453");
return;
}
@ -127,9 +127,9 @@ namespace Microsoft.DotNet.Tests.EndToEnd
[Fact]
public void TestDotnetCompileNativeCppIncremental()
{
if (IsCentOS())
if (IsCentOSorRHEL())
{
Console.WriteLine("Skipping native compilation tests on CentOS - https://github.com/dotnet/cli/issues/453");
Console.WriteLine("Skipping native compilation tests on CentOS/RHEL - https://github.com/dotnet/cli/issues/453");
return;
}
@ -236,7 +236,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
Directory.SetCurrentDirectory(currentDirectory);
}
private bool IsCentOS()
private bool IsCentOSorRHEL()
{
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
@ -244,7 +244,8 @@ namespace Microsoft.DotNet.Tests.EndToEnd
if(File.Exists(OSIDFILE))
{
return File.ReadAllText(OSIDFILE).ToLower().Contains("centos");
string osidcontent = File.ReadAllText(OSIDFILE).ToLower();
return osidcontent.Contains("centos") || osidcontent.Contains("rhel");
}
}