Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: webkit/tools/layout_tests/layout_package/platform_utils_win.py

Issue 353014: Fix the windows search path to look in oldest applicable platform dir first... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """This is the Linux implementation of the layout_package.platform_utils 5 """This is the Linux implementation of the layout_package.platform_utils
6 package. This file should only be imported by that package.""" 6 package. This file should only be imported by that package."""
7 7
8 import path_utils 8 import path_utils
9 import subprocess 9 import subprocess
10 import sys 10 import sys
(...skipping 25 matching lines...) Expand all
36 for all versions instead of the current version that the script 36 for all versions instead of the current version that the script
37 is running on. This is for case that the platform or version of 37 is running on. This is for case that the platform or version of
38 the search paths is different from the platform or version that the 38 the search paths is different from the platform or version that the
39 script is running on. For example, the rebaseline tool may run on Mac, 39 script is running on. For example, the rebaseline tool may run on Mac,
40 Linux or Windows Vista to rebaseline for Windows XP, in which case, 40 Linux or Windows Vista to rebaseline for Windows XP, in which case,
41 it gets a full list, finds the rebaselining dir (XP) and compares 41 it gets a full list, finds the rebaselining dir (XP) and compares
42 the XP baseline with fallback baselines. 42 the XP baseline with fallback baselines.
43 """ 43 """
44 44
45 dirs = [] 45 dirs = []
46 if all_versions or PlatformVersion() == "-xp":
47 dirs.append(path_utils.ChromiumBaselinePath('chromium-win-xp'))
48 if all_versions or PlatformVersion() in ("-vista", "-xp"):
49 dirs.append(path_utils.ChromiumBaselinePath('chromium-win-vista'))
46 if all_versions or PlatformVersion() in ("-7", "-vista", "-xp"): 50 if all_versions or PlatformVersion() in ("-7", "-vista", "-xp"):
47 dirs.append(path_utils.ChromiumBaselinePath('chromium-win-7')) 51 dirs.append(path_utils.ChromiumBaselinePath('chromium-win-7'))
48 if all_versions or PlatformVersion() in ("-vista", "-xp"):
49 dirs.append(path_utils.ChromiumBaselinePath('chromium-win-vista'))
50 if all_versions or PlatformVersion() == "-xp":
51 dirs.append(path_utils.ChromiumBaselinePath('chromium-win-xp'))
52 dirs.append(path_utils.ChromiumBaselinePath('chromium-win')) 52 dirs.append(path_utils.ChromiumBaselinePath('chromium-win'))
53 dirs.append(path_utils.WebKitBaselinePath('win')) 53 dirs.append(path_utils.WebKitBaselinePath('win'))
54 dirs.append(path_utils.WebKitBaselinePath('mac')) 54 dirs.append(path_utils.WebKitBaselinePath('mac'))
55 return dirs 55 return dirs
56 56
57 def WDiffPath(): 57 def WDiffPath():
58 """Path to the WDiff executable, whose binary is checked in on Win""" 58 """Path to the WDiff executable, whose binary is checked in on Win"""
59 return path_utils.PathFromBase('third_party', 'cygwin', 'bin', 'wdiff.exe') 59 return path_utils.PathFromBase('third_party', 'cygwin', 'bin', 'wdiff.exe')
60 60
61 def ImageDiffPath(target): 61 def ImageDiffPath(target):
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 two places: src/webkit/$target (preferably, which we get if we 138 two places: src/webkit/$target (preferably, which we get if we
139 built using webkit.gyp), or src/chrome/$target (if compiled some other 139 built using webkit.gyp), or src/chrome/$target (if compiled some other
140 way).""" 140 way)."""
141 try: 141 try:
142 return path_utils.PathFromBase('webkit', target, binary) 142 return path_utils.PathFromBase('webkit', target, binary)
143 except path_utils.PathNotFound: 143 except path_utils.PathNotFound:
144 try: 144 try:
145 return path_utils.PathFromBase('chrome', target, binary) 145 return path_utils.PathFromBase('chrome', target, binary)
146 except path_utils.PathNotFound: 146 except path_utils.PathNotFound:
147 return path_utils.PathFromBase('build', target, binary) 147 return path_utils.PathFromBase('build', target, binary)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698