third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mac.py - Issue 2582293004: Remove use of wdiff from layout test runner.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mac.py

Issue 2582293004: Remove use of wdiff from layout test runner. (Closed)

Patch Set: Rebased Created 3 years, 11 months 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # Copyright (C) 2010 Google Inc. All rights reserved.	1 # Copyright (C) 2010 Google Inc. All rights reserved.

2 #	2 #

3 # Redistribution and use in source and binary forms, with or without	3 # Redistribution and use in source and binary forms, with or without

4 # modification, are permitted provided that the following conditions are	4 # modification, are permitted provided that the following conditions are

5 # met:	5 # met:

6 #	6 #

7 # * Redistributions of source code must retain the above copyright	7 # * Redistributions of source code must retain the above copyright

8 # notice, this list of conditions and the following disclaimer.	8 # notice, this list of conditions and the following disclaimer.

9 # * Redistributions in binary form must reproduce the above	9 # * Redistributions in binary form must reproduce the above

10 # copyright notice, this list of conditions and the following disclaimer	10 # copyright notice, this list of conditions and the following disclaimer

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85	85

86 return result	86 return result

87	87

88 def operating_system(self):	88 def operating_system(self):

89 return 'mac'	89 return 'mac'

90	90

91 #	91 #

92 # PROTECTED METHODS	92 # PROTECTED METHODS

93 #	93 #

94	94

95 def _wdiff_missing_message(self):

96 return 'wdiff is not installed; please install from MacPorts or elsewher e'

97

98 def path_to_apache(self):	95 def path_to_apache(self):

99 return '/usr/sbin/httpd'	96 return '/usr/sbin/httpd'

100	97

101 def path_to_apache_config_file(self):	98 def path_to_apache_config_file(self):

102 config_file_name = 'apache2-httpd-' + self._apache_version() + '.conf'	99 config_file_name = 'apache2-httpd-' + self._apache_version() + '.conf'

103 return self._filesystem.join(self.apache_config_directory(), config_file _name)	100 return self._filesystem.join(self.apache_config_directory(), config_file _name)

104	101

105 def _path_to_driver(self, target=None):	102 def _path_to_driver(self, target=None):

106 return self._build_path_with_target(target, self.driver_name() + '.app', 'Contents', 'MacOS', self.driver_name())	103 return self._build_path_with_target(target, self.driver_name() + '.app', 'Contents', 'MacOS', self.driver_name())

107

108 def _path_to_wdiff(self):

109 return 'wdiff'

OLD	NEW