webkitpy test fix on Mac after r164244.

It's somewhat crazy that we're trying to run unittests for Windows on Mac but whatever.

* Scripts/webkitpy/port/win.py:
(WinPort._ntsd_location):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 552e00eaac727ad089c5b8fa6cc9f4d2f224fb55..5611527781353499651d00abe03d972e189f3d57 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-17  Ryosuke Niwa  <rniwa@webkit.org>
+
+        webkitpy test fix on Mac after r164244.
+
+        It's somewhat crazy that we're trying to run unittests for Windows on Mac but whatever.
+
+        * Scripts/webkitpy/port/win.py:
+        (WinPort._ntsd_location):
+
 2014-02-17  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Fall back to Windows symbol servers when necessary

diff --git a/Tools/Scripts/webkitpy/port/win.py b/Tools/Scripts/webkitpy/port/win.py
index 46e15a1176dc1782b91e2a41b89af9a153675e68..a509e4da2d10686b6ac83ea93182e5f71bea1f76 100644 (file)
--- a/Tools/Scripts/webkitpy/port/win.py
+++ b/Tools/Scripts/webkitpy/port/win.py
@@ -138,6 +138,8 @@ class WinPort(ApplePort):
         return map(self._webkit_baseline_path, test_fallback_names)
 
     def _ntsd_location(self):
+        if 'PROGRAMFILES' not in os.environ:
+            return None
         possible_paths = [self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x86", "ntsd.exe"),
             self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x64", "ntsd.exe"),
             self._filesystem.join(os.environ['PROGRAMFILES'], "Debugging Tools for Windows (x86)", "ntsd.exe"),