Changeset 118621 in webkit

Timestamp:

May 26, 2012, 11:52:07 PM (14 years ago)

Author:

ddkilzer@apple.com

Message:

Use xcrun to find path to nm for Mac port
<​http://webkit.org/b/87588>

Reviewed by Dan Bernstein.

• Scripts/webkitpy/layout_tests/port/mac.py:

(MacPort.nm_command): Add. Tries to find a path for the nm
command using xcrun. Falls back to returning 'nm'.

• Scripts/webkitpy/layout_tests/port/webkit.py:

(WebKitPort.nm_command): Add. Returns 'nm'.
(WebKitPort._webcore_symbols_string): Call self.nm_command().

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/mac.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-26  David Kilzer  <ddkilzer@apple.com>
+
+        Use xcrun to find path to nm for Mac port
+        <http://webkit.org/b/87588>
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        (MacPort.nm_command): Add. Tries to find a path for the nm
+        command using xcrun.  Falls back to returning 'nm'.
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        (WebKitPort.nm_command): Add. Returns 'nm'.
+        (WebKitPort._webcore_symbols_string): Call self.nm_command().
+
 2012-05-25  Lynn Neir  <lynn.neir@skype.net>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -1 +1 @@
 # Copyright (C) 2011 Google Inc. All rights reserved.
+# Copyright (C) 2012 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -240 +241 @@
                 pass
             self._helper = None
+
+    def nm_command(self):
+        try:
+            return self._executive.run_command(['xcrun', '-find', 'nm']).rstrip()
+        except ScriptError, e:
+            _log.warn("xcrun failed; falling back to 'nm'.")
+            return 'nm'

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -2 +2 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi <rgabor@inf.u-szeged.hu>, University of Szeged
-# Copyright (C) 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -263 +263 @@
         return None
 
+    def nm_command(self):
+        return 'nm'
+
     def _webcore_symbols_string(self):
         webcore_library_path = self._path_to_webcore_library()
@@ -268 +271 @@
             return None
         try:
-            return self._executive.run_command(['nm', webcore_library_path], error_handler=Executive.ignore_error)
+            return self._executive.run_command([self.nm_command(), webcore_library_path], error_handler=Executive.ignore_error)
         except OSError, e:
             _log.warn("Failed to run nm: %s.  Can't determine WebCore supported features." % e)