Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 10 insertions, 1 deletions

diff --git a/Tools/Scripts/webkitpy/common/system/filesystem_mock.py b/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
index ea0f3f9..c605cb2 100644
--- a/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
+++ b/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
@@ -29,6 +29,7 @@
 import errno
 import os
 import path
+import re
 
 
 class MockFileSystem(object):
@@ -57,7 +58,7 @@ class MockFileSystem(object):
         return any(f.startswith(path) for f in self.files)
 
     def join(self, *comps):
-        return '/'.join(comps)
+        return re.sub(re.escape(os.path.sep), '/', os.path.join(*comps))
 
     def listdir(self, path):
         if not self.isdir(path):
@@ -107,3 +108,11 @@ class MockFileSystem(object):
             raise IOError(errno.EISDIR, destination, os.strerror(errno.ISDIR))
 
         self.files[destination] = self.files[source]
+
+    def files_under(self, path):
+        if not path.endswith('/'):
+            path += '/'
+        return [file for file in self.files if file.startswith(path)]
+
+    def remove(self, path):
+        del self.files[path]