[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6e0d5b2f263f49a4bc4c65c1fd73c47af30724b3
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 19:27:41 2010 +0000

    2010-11-29  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            config.webkit_base_dir returns a path with a trailing slash
            https://bugs.webkit.org/show_bug.cgi?id=50197
    
            config.webkit_base_dir() should return a path without a trailing slash,
            like all the other methods that return paths.
    
            Undoes MockFileSytem changes by r72640, since they're no longer
            necessary for GetBaselinesTest to pass.
    
            * Scripts/webkitpy/common/system/filesystem_mock.py:
            * Scripts/webkitpy/layout_tests/port/base.py:
            * Scripts/webkitpy/layout_tests/port/config.py:
            * Scripts/webkitpy/layout_tests/port/config_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4f67b23..c686b8a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-29  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        config.webkit_base_dir returns a path with a trailing slash
+        https://bugs.webkit.org/show_bug.cgi?id=50197
+        
+        config.webkit_base_dir() should return a path without a trailing slash,
+        like all the other methods that return paths.
+        
+        Undoes MockFileSytem changes by r72640, since they're no longer
+        necessary for GetBaselinesTest to pass.
+
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/config.py:
+        * Scripts/webkitpy/layout_tests/port/config_unittest.py:
+
 2010-11-30  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py b/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py
index 4e6d3da..2dbc1e8 100644
--- a/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py
+++ b/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py
@@ -49,16 +49,7 @@ class MockFileSystem(object):
         return False
 
     def join(self, *comps):
-        # os.path.join ignores trailing slashes on components (i.e.
-        # join('foo/', 'bar') and join('foo', 'bar') produce the same result),
-        # we emulate that behavior.
-        trimmed_comps = []
-        for comp in comps:
-            if len(comp) and comp[-1] == '/':
-                trimmed_comps.append(comp[0:-1])
-            else:
-                trimmed_comps.append(comp)
-        return '/'.join(trimmed_comps)
+        return '/'.join(comps)
 
     def maybe_make_directory(self, *path):
         # FIXME: Implement such that subsequent calls to isdir() work?
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index 757318d..bc5a9aa 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -492,7 +492,7 @@ class Port(object):
         """Relative unix-style path for a filename under the LayoutTests
         directory. Filenames outside the LayoutTests directory should raise
         an error."""
-        #assert(filename.startswith(self.layout_tests_dir()))
+        assert filename.startswith(self.layout_tests_dir()), "%s did not start with %s" % (filename, self.layout_tests_dir())
         return filename[len(self.layout_tests_dir()) + 1:]
 
     def results_directory(self):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/config.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/config.py
index 9aec637..88f1146 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/config.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/config.py
@@ -132,7 +132,7 @@ class Config(object):
         # This code will also work if there is no SCM system at all.
         if not self._webkit_base_dir:
             abspath = os.path.abspath(__file__)
-            self._webkit_base_dir = abspath[0:abspath.find('WebKitTools')]
+            self._webkit_base_dir = abspath[0:abspath.find('WebKitTools') - 1]
         return self._webkit_base_dir
 
     def _script_path(self, script_name):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/config_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/config_unittest.py
index 2d23691..8ec28fc 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/config_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/config_unittest.py
@@ -186,6 +186,7 @@ class ConfigTest(unittest.TestCase):
         c = config.Config(executive.Executive(), filesystem.FileSystem())
         base_dir = c.webkit_base_dir()
         self.assertTrue(base_dir)
+        self.assertNotEqual(base_dir[-1], '/')
 
         orig_cwd = os.getcwd()
         os.chdir(os.environ['HOME'])

-- 
WebKit Debian packaging