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

Fixed bitness and removed 50

This commit is contained in:
David Fowler 2014-09-05 02:20:22 -07:00
parent 2471d21d93
commit bb08bdd1e8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/E2ETests/DeploymentUtility.cs
View File

@ -19,7 +19,7 @@ namespace E2ETests
var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe"); var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe");
// Get path to 64 bit of IIS Express // Get path to 64 bit of IIS Express
if (architecture == KreArchitecture.x64) if (architecture == KreArchitecture.amd64)
{ {
iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe"); iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe");
@ -186,9 +186,9 @@ namespace E2ETests
StringBuilder replaceStr = new StringBuilder(); StringBuilder replaceStr = new StringBuilder();
replaceStr.Append("KRE"); replaceStr.Append("KRE");
replaceStr.Append((kreFlavor == KreFlavor.CoreClr) ? "-CoreCLR" : "-CLR"); replaceStr.Append((kreFlavor == KreFlavor.CoreClr) ? "-CoreCLR" : "-CLR");
replaceStr.Append((kreArchitecture == KreArchitecture.x86) ? "-x86" : "-x64"); replaceStr.Append((kreArchitecture == KreArchitecture.x86) ? "-x86" : "-amd64");
pathValue = Regex.Replace(pathValue, "KRE-(CLR|CoreCLR)50-(x86|x64)", replaceStr.ToString(), RegexOptions.IgnoreCase); pathValue = Regex.Replace(pathValue, "KRE-(CLR|CoreCLR)-(x86|amd64)", replaceStr.ToString(), RegexOptions.IgnoreCase);
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Setting %PATH% value to : {0}", pathValue); Console.WriteLine("Setting %PATH% value to : {0}", pathValue);

2
test/E2ETests/KreArchitecture.cs
View File

@ -2,7 +2,7 @@
{ {
public enum KreArchitecture public enum KreArchitecture
{ {
x64, amd64,
x86 x86
} }
} }

8
test/E2ETests/SmokeTests.cs
View File

@ -20,10 +20,10 @@ namespace E2ETests
[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/", false)] [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/", false)]
[InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/", false)] [InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/", false)]
[InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5004/", false)] [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5004/", false)]
[InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x64, "http://localhost:5002/", false)] [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5002/", false)]
[InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/", true)] [InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/", true)]
[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5001/", false)] [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5001/", false)]
[InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5004/", false)] [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5004/", false)]
public void SmokeTestSuite(ServerType hostType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl, bool RunTestOnMono = false) public void SmokeTestSuite(ServerType hostType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl, bool RunTestOnMono = false)
{ {
Console.WriteLine("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", hostType, kreFlavor, architecture, applicationBaseUrl); Console.WriteLine("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", hostType, kreFlavor, architecture, applicationBaseUrl);
@ -45,7 +45,7 @@ namespace E2ETests
} }
// Check if processor architecture is x64, else skip test // Check if processor architecture is x64, else skip test
if (architecture == KreArchitecture.x64 && !Environment.Is64BitOperatingSystem) if (architecture == KreArchitecture.amd64 && !Environment.Is64BitOperatingSystem)
{ {
Console.WriteLine("Skipping x64 test since machine is of type x86"); Console.WriteLine("Skipping x64 test since machine is of type x86");
Assert.True(true); Assert.True(true);