Changeset 58376 in webkit

Timestamp:

Apr 27, 2010 9:49:41 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-27 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

run-bindings-tests doesn't work in an SVN checkout
​https://bugs.webkit.org/show_bug.cgi?id=38225

Previously detect_scm_system needed an absolute path for SVN. Now we
accept a relative path.

• Scripts/webkitpy/common/checkout/scm.py:
• Scripts/webkitpy/common/checkout/scm_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        run-bindings-tests doesn't work in an SVN checkout
+        https://bugs.webkit.org/show_bug.cgi?id=38225
+
+        Previously detect_scm_system needed an absolute path for SVN.  Now we
+        accept a relative path.
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+
 2010-04-27  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py

@@ -42 +42 @@
 
 def detect_scm_system(path):
-    if SVN.in_working_directory(path):
-        return SVN(cwd=path)
+    absolute_path = os.path.abspath(path)
+
+    if SVN.in_working_directory(absolute_path):
+        return SVN(cwd=absolute_path)
     
-    if Git.in_working_directory(path):
-        return Git(cwd=path)
+    if Git.in_working_directory(absolute_path):
+        return Git(cwd=absolute_path)
     
     return None

trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm_unittest.py

@@ -488 +488 @@
         SVNTestRepository.tear_down(self)
 
+    def test_detect_scm_system_relative_url(self):
+        scm = detect_scm_system(".")
+        # I wanted to assert that we got the right path, but there was some
+        # crazy magic with temp folder names that I couldn't figure out.
+        self.assertTrue(scm.checkout_root)
+
     def test_create_patch_is_full_patch(self):
         test_dir_path = os.path.join(self.svn_checkout_path, "test_dir2")