[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1fadb54015aa90fa067bb5c7995e57563fc98005
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 23:57:15 2009 +0000

    2009-10-16  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            run-webkit-tests fails when CWD is not inside a WebKit checkout
            https://bugs.webkit.org/show_bug.cgi?id=30451
    
            * Scripts/modules/scm.py: in_working_directory shouldn't throw exceptions on failure.
            * Scripts/modules/scm_unittest.py:
              - Remove use of original_path (we don't need to restore the CWD).
              - Don't use '.' to find the webkit checkout, use __file__ instead.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3b62836..a477c65 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        run-webkit-tests fails when CWD is not inside a WebKit checkout
+        https://bugs.webkit.org/show_bug.cgi?id=30451
+
+        * Scripts/modules/scm.py: in_working_directory shouldn't throw exceptions on failure.
+        * Scripts/modules/scm_unittest.py:
+          - Remove use of original_path (we don't need to restore the CWD).
+          - Don't use '.' to find the webkit checkout, use __file__ instead.
+
 2009-10-16  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/Scripts/modules/scm.py b/WebKitTools/Scripts/modules/scm.py
index 3daecbc..704f65c 100644
--- a/WebKitTools/Scripts/modules/scm.py
+++ b/WebKitTools/Scripts/modules/scm.py
@@ -392,7 +392,7 @@ class Git(SCM):
 
     @classmethod
     def in_working_directory(cls, path):
-        return cls.run_command(['git', 'rev-parse', '--is-inside-work-tree'], cwd=path) == "true"
+        return cls.run_command(['git', 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=ignore_error) == "true"
 
     @classmethod
     def find_checkout_root(cls, path):
diff --git a/WebKitTools/Scripts/modules/scm_unittest.py b/WebKitTools/Scripts/modules/scm_unittest.py
index 58494a0..ed9066d 100644
--- a/WebKitTools/Scripts/modules/scm_unittest.py
+++ b/WebKitTools/Scripts/modules/scm_unittest.py
@@ -95,8 +95,6 @@ class SVNTestRepository:
 
     @classmethod
     def setup(cls, test_object):
-        test_object.original_path = os.path.abspath('.')
-
         # Create an test SVN repository
         test_object.svn_repo_path = tempfile.mkdtemp(suffix="svn_test_repo")
         test_object.svn_repo_url = "file://%s" % test_object.svn_repo_path # Not sure this will work on windows
@@ -127,7 +125,7 @@ class SCMTest(unittest.TestCase):
         return patch
 
     def _setup_webkittools_scripts_symlink(self, local_scm):
-        webkit_scm = detect_scm_system(self.original_path)
+        webkit_scm = detect_scm_system(os.path.dirname(os.path.abspath(__file__)))
         webkit_scripts_directory = webkit_scm.scripts_directory()
         local_scripts_directory = local_scm.scripts_directory()
         os.mkdir(os.path.dirname(local_scripts_directory))
@@ -188,7 +186,6 @@ class SVNTest(SCMTest):
 
     def tearDown(self):
         SVNTestRepository.tear_down(self)
-        os.chdir(self.original_path)
 
     def test_create_patch_is_full_patch(self):
         test_dir_path = os.path.join(self.svn_checkout_path, 'test_dir')
@@ -284,7 +281,6 @@ class GitTest(SCMTest):
     def tearDown(self):
         SVNTestRepository.tear_down(self)
         self._tear_down_git_clone_of_svn_repository()
-        os.chdir(self.original_path)
 
     def test_detection(self):
         scm = detect_scm_system(self.git_checkout_path)

-- 
WebKit Debian packaging