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

Fixing the KRE name issue on mono 

On mono with a recent change --runtime <value> for kpm pack is null as the value is not populated.
This commit is contained in:
Praburaj 2014-12-19 13:45:51 -08:00
parent e5a92daa51
commit a9ea8a87c8
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/E2ETests/Common/DeploymentUtility.cs
View File

@ -88,7 +88,7 @@ namespace E2ETests
else else
{ {
//Tweak the %PATH% to the point to the right KREFLAVOR //Tweak the %PATH% to the point to the right KREFLAVOR
startParameters.KreName = SwitchPathToKreFlavor(startParameters.KreFlavor, startParameters.KreArchitecture); startParameters.Kre = SwitchPathToKreFlavor(startParameters.KreFlavor, startParameters.KreArchitecture);
//Reason to do pack here instead of in a common place is use the right KRE to do the packing. Previous line switches to use the right KRE. //Reason to do pack here instead of in a common place is use the right KRE to do the packing. Previous line switches to use the right KRE.
if (startParameters.PackApplicationBeforeStart) if (startParameters.PackApplicationBeforeStart)
@ -163,15 +163,6 @@ namespace E2ETests
private static Process StartMonoHost(StartParameters startParameters) private static Process StartMonoHost(StartParameters startParameters)
{ {
if (startParameters.PackApplicationBeforeStart)
{
KpmPack(startParameters);
}
//Mono does not have a way to pass in a --appbase switch. So it will be an environment variable.
Environment.SetEnvironmentVariable("KRE_APPBASE", startParameters.ApplicationPath);
Console.WriteLine("Setting the KRE_APPBASE to {0}", startParameters.ApplicationPath);
var path = Environment.GetEnvironmentVariable("PATH"); var path = Environment.GetEnvironmentVariable("PATH");
var kreBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Where(c => c.Contains("KRE-Mono")).FirstOrDefault(); var kreBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Where(c => c.Contains("KRE-Mono")).FirstOrDefault();
@ -180,6 +171,17 @@ namespace E2ETests
throw new Exception("KRE not detected on the machine."); throw new Exception("KRE not detected on the machine.");
} }
if (startParameters.PackApplicationBeforeStart)
{
// We use full path to KRE to pack.
startParameters.Kre = kreBin;
KpmPack(startParameters);
}
//Mono does not have a way to pass in a --appbase switch. So it will be an environment variable.
Environment.SetEnvironmentVariable("KRE_APPBASE", startParameters.ApplicationPath);
Console.WriteLine("Setting the KRE_APPBASE to {0}", startParameters.ApplicationPath);
var monoPath = "mono"; var monoPath = "mono";
var klrMonoManaged = Path.Combine(kreBin, "klr.mono.managed.dll"); var klrMonoManaged = Path.Combine(kreBin, "klr.mono.managed.dll");
var applicationHost = Path.Combine(kreBin, "Microsoft.Framework.ApplicationHost"); var applicationHost = Path.Combine(kreBin, "Microsoft.Framework.ApplicationHost");
@ -306,7 +308,7 @@ namespace E2ETests
{ {
startParameters.PackedApplicationRootPath = Path.Combine(packRoot ?? Path.GetTempPath(), Guid.NewGuid().ToString()); startParameters.PackedApplicationRootPath = Path.Combine(packRoot ?? Path.GetTempPath(), Guid.NewGuid().ToString());
var parameters = string.Format("pack {0} -o {1} --runtime {2}", startParameters.ApplicationPath, startParameters.PackedApplicationRootPath, startParameters.KreName); var parameters = string.Format("pack {0} -o {1} --runtime {2}", startParameters.ApplicationPath, startParameters.PackedApplicationRootPath, startParameters.Kre);
Console.WriteLine(string.Format("Executing command kpm {0}", parameters)); Console.WriteLine(string.Format("Executing command kpm {0}", parameters));
var startInfo = new ProcessStartInfo var startInfo = new ProcessStartInfo

2
test/E2ETests/Common/StartParameters.cs
View File

@ -25,7 +25,7 @@
public string PackedApplicationRootPath { get; set; } public string PackedApplicationRootPath { get; set; }
public string KreName { get; set; } public string Kre { get; set; }
public IISApplication IISApplication { get; set; } public IISApplication IISApplication { get; set; }
} }