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/Test | |
parent | 0a515cf13be8b87993c60494d2be80df17031bfe (diff) |
Fix failures in MSBuild tests on Windows
Diffstat (limited to 'mcs/class/Microsoft.Build/Test')
-rw-r--r-- | mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectItemTest.cs | 14 | ||||
-rw-r--r-- | mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectItemTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectItemTest.cs index 61973b7ceb4..f3b3524ba81 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectItemTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectItemTest.cs @@ -90,7 +90,7 @@ namespace MonoTests.Microsoft.Build.Evaluation { string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'> <ItemGroup> - <Foo Include='Test/ProjectItemTestTemporary/parent/dir*/a*.cs;Test/ProjectItemTestTemporary/x.cs' /> + <Foo Include='" + "Test/ProjectItemTestTemporary/parent/dir*/a*.cs;Test/ProjectItemTestTemporary/x.cs".Replace ('/', Path.DirectorySeparatorChar) + @"' /> </ItemGroup> </Project>"; try { @@ -106,7 +106,7 @@ namespace MonoTests.Microsoft.Build.Evaluation { string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'> <ItemGroup> - <Foo Include='Test/ProjectItemTestTemporary/parent/**/a*.cs;Test/ProjectItemTestTemporary/x.cs' /> + <Foo Include='" + "Test/ProjectItemTestTemporary/parent/**/a*.cs;Test/ProjectItemTestTemporary/x.cs".Replace ('/', Path.DirectorySeparatorChar) + @"' /> </ItemGroup> </Project>"; try { @@ -127,23 +127,23 @@ namespace MonoTests.Microsoft.Build.Evaluation // sort is needed because they are only sorted by ItemType. var items = proj.Items.OrderBy (p => p.EvaluatedInclude).ToArray (); Assert.AreEqual (5, items.Length, "#1"); - Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir1{0}a.cs", Path.DirectorySeparatorChar), items [0].EvaluatedInclude, "#2"); + Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir1/a.cs", items [0].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#2"); Assert.AreEqual ("a", items [0].GetMetadataValue ("Filename"), "#3"); if (hasRecursiveDir) Assert.AreEqual ("dir1" + sep, items [0].GetMetadataValue ("RecursiveDir"), "#3.2"); - Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir1{0}a1.cs", Path.DirectorySeparatorChar), items [1].EvaluatedInclude, "#4"); + Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir1/a1.cs", items [1].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#4"); Assert.AreEqual ("a1", items [1].GetMetadataValue ("Filename"), "#5"); if (hasRecursiveDir) Assert.AreEqual ("dir1" + sep, items [1].GetMetadataValue ("RecursiveDir"), "#5.2"); - Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir2{0}a.cs", Path.DirectorySeparatorChar), items [2].EvaluatedInclude, "#6"); + Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir2/a.cs", items [2].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#6"); Assert.AreEqual ("a", items [2].GetMetadataValue ("Filename"), "#7"); if (hasRecursiveDir) Assert.AreEqual ("dir2" + sep, items [2].GetMetadataValue ("RecursiveDir"), "#7.2"); - Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir2{0}a2.cs", Path.DirectorySeparatorChar), items [3].EvaluatedInclude, "#8"); + Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir2/a2.cs", items [3].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#8"); Assert.AreEqual ("a2", items [3].GetMetadataValue ("Filename"), "#9"); if (hasRecursiveDir) Assert.AreEqual ("dir2" + sep, items [3].GetMetadataValue ("RecursiveDir"), "#9.2"); - Assert.AreEqual ("Test/ProjectItemTestTemporary/x.cs", items [4].EvaluatedInclude, "#10"); + Assert.AreEqual ("Test/ProjectItemTestTemporary/x.cs", items [4].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#10"); for (int i = 0; i < items.Length; i++) Assert.AreEqual (xitem, items [i].Xml, "#11:" + i); } diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs index 9723191bf16..f14bcd864ac 100644 --- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs +++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs @@ -108,7 +108,8 @@ namespace MonoTests.Microsoft.Build.Execution Assert.IsTrue (sub.BuildResult.OverallResult == BuildResultCode.Success, "#1"); DateTime endBuildDone = DateTime.Now; Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2"); - Assert.IsTrue (endBuildDone > waitDone, "#3"); + Assert.IsTrue (waitDone >= beforeExec, "#3"); + Assert.IsTrue (endBuildDone >= waitDone, "#4"); } [Test] |