diff options
author | Niklas Therning <niklas@therning.org> | 2016-10-06 20:58:32 +0300 |
---|---|---|
committer | Niklas Therning <niklas@therning.org> | 2016-10-07 16:29:04 +0300 |
commit | 149c4509f1072849ae49fff8b63bddf5cc7e4afd (patch) | |
tree | 71b41333d57d1ded1cf51d4afde13bd103b75bb1 /mcs/class/Microsoft.Build.Engine | |
parent | 0a515cf13be8b87993c60494d2be80df17031bfe (diff) |
Fix failures in MSBuild tests on Windows
Diffstat (limited to 'mcs/class/Microsoft.Build.Engine')
3 files changed, 14 insertions, 5 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/PredefinedPropertyFunctionsTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/PredefinedPropertyFunctionsTest.cs index 1a4e4317421..2398184df6d 100644 --- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/PredefinedPropertyFunctionsTest.cs +++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/PredefinedPropertyFunctionsTest.cs @@ -24,6 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using System; +using System.IO; using Microsoft.Build.BuildEngine; using NUnit.Framework; @@ -61,6 +62,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine { </Project> "; + if (Path.DirectorySeparatorChar == '\\') { + documentString = documentString.Replace ("/home", "c:/home"); + documentString = documentString.Replace ("/tmp", "c:/tmp"); + } + var engine = new Engine (Consts.BinPath); var project = engine.CreateNewProject (); project.LoadXml (documentString); diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs index 6c7919e6ae7..459bb66e6d5 100644 --- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs +++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs @@ -40,6 +40,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine { [TestFixture] public class TargetTest { + static bool isMono = Type.GetType ("Mono.Runtime", false) != null; Engine engine; Project project; @@ -351,16 +352,16 @@ namespace MonoTests.Microsoft.Build.BuildEngine { bool Build (string projectXml, ILogger logger) { - if (Environment.OSVersion.Platform == PlatformID.Win32NT) { + if (!isMono) { var reader = new StringReader (projectXml); var xml = XmlReader.Create (reader); - return BuildOnWindows (xml, logger); + return BuildOnDotNet (xml, logger); } else { - return BuildOnLinux (projectXml, logger); + return BuildOnMono (projectXml, logger); } } - bool BuildOnWindows (XmlReader reader, ILogger logger) + bool BuildOnDotNet (XmlReader reader, ILogger logger) { var type = Type.GetType ("Microsoft.Build.Evaluation.ProjectCollection, Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); @@ -376,7 +377,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine { return ret; } - bool BuildOnLinux (string projectXml, ILogger logger) + bool BuildOnMono (string projectXml, ILogger logger) { var engine = new Engine (Consts.BinPath); var project = engine.CreateNewProject (); diff --git a/mcs/class/Microsoft.Build.Engine/Test/various/Properties.cs b/mcs/class/Microsoft.Build.Engine/Test/various/Properties.cs index 54f1c8a94cc..144a6d72ea2 100644 --- a/mcs/class/Microsoft.Build.Engine/Test/various/Properties.cs +++ b/mcs/class/Microsoft.Build.Engine/Test/various/Properties.cs @@ -129,6 +129,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various { } [Test] + [SetCulture ("en-us")] public void AllowedFrameworkMembers () { string documentString = @" @@ -202,6 +203,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various { } [Test] + [SetCulture ("en-us")] public void MSBuildPropertyFunctions () { string documentString = @" |