[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

mihaip at chromium.org mihaip at chromium.org
Sun Feb 20 23:12:49 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit bd3302dc661f9e9c4bea5068edf2f128bd74bdff
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 00:15:34 2011 +0000

    2011-01-18  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [Chromium] NRWT looking for DRT binary in the wrong path on Mac
            https://bugs.webkit.org/show_bug.cgi?id=52678
    
            Update path now that WebKit is inside Source.
    
            * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76081 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a8037d9..8cbfcc3 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-18  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] NRWT looking for DRT binary in the wrong path on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=52678
+        
+        Update path now that WebKit is inside Source.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+
 2011-01-18  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
index f638e01..6802707 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
@@ -108,8 +108,8 @@ class ChromiumMacPort(chromium.ChromiumPort):
         path = self.path_from_chromium_base('xcodebuild', *comps)
         if os.path.exists(path) or self.get_option('use_test_shell'):
             return path
-        return self.path_from_webkit_base('WebKit', 'chromium', 'xcodebuild',
-                                          *comps)
+        return self.path_from_webkit_base(
+            'Source', 'WebKit', 'chromium', 'xcodebuild', *comps)
 
     def _check_wdiff_install(self):
         try:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list