Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -37,7 +37,7 @@ namespace MonoTests.Mono.Unix
Assert.AreEqual ("one", path);
path = UnixPath.Combine (current, "one");
expected = current + DSC + "one";
expected = (current == "/" ? String.Empty : current) + DSC + "one";
Assert.AreEqual (expected, path);
path = UnixPath.Combine ("one", current);