[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
dpranke at chromium.org
dpranke at chromium.org
Sun Feb 20 23:21:15 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 7c771c501503fce305bf6217b283f4a2a173953a
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 02:16:33 2011 +0000
2011-01-19 Dirk Pranke <dpranke at chromium.org>
Unreviewed, build fix.
Fix a few incorrect "self._filesystem" references introduced in
r76184.
* Scripts/webkitpy/layout_tests/port/chromium.py:
* Scripts/webkitpy/layout_tests/port/chromium_linux.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76190 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b20dfcb..d41901d 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
2011-01-19 Dirk Pranke <dpranke at chromium.org>
+ Unreviewed, build fix.
+
+ Fix a few incorrect "self._filesystem" references introduced in
+ r76184.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+
+2011-01-19 Dirk Pranke <dpranke at chromium.org>
+
Reviewed by Mihai Parparita.
add a .sep property, abspath(), isabs(), mtime(), and
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index eebf853..ad1bea6 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -56,26 +56,6 @@ _log = logging.getLogger("webkitpy.layout_tests.port.chromium")
# FIXME: This function doesn't belong in this package.
-def check_file_exists(path_to_file, file_description, override_step=None,
- logging=True):
- """Verify the file is present where expected or log an error.
-
- Args:
- file_name: The (human friendly) name or description of the file
- you're looking for (e.g., "HTTP Server"). Used for error logging.
- override_step: An optional string to be logged if the check fails.
- logging: Whether or not log the error messages."""
- if not self._filesystem.exists(path_to_file):
- if logging:
- _log.error('Unable to find %s' % file_description)
- _log.error(' at %s' % path_to_file)
- if override_step:
- _log.error(' %s' % override_step)
- _log.error('')
- return False
- return True
-
-
class ChromiumPort(base.Port):
"""Abstract base class for Chromium implementations of the Port class."""
@@ -83,6 +63,26 @@ class ChromiumPort(base.Port):
base.Port.__init__(self, **kwargs)
self._chromium_base_dir = None
+ def _check_file_exists(self, path_to_file, file_description,
+ override_step=None, logging=True):
+ """Verify the file is present where expected or log an error.
+
+ Args:
+ file_name: The (human friendly) name or description of the file
+ you're looking for (e.g., "HTTP Server"). Used for error logging.
+ override_step: An optional string to be logged if the check fails.
+ logging: Whether or not log the error messages."""
+ if not self._filesystem.exists(path_to_file):
+ if logging:
+ _log.error('Unable to find %s' % file_description)
+ _log.error(' at %s' % path_to_file)
+ if override_step:
+ _log.error(' %s' % override_step)
+ _log.error('')
+ return False
+ return True
+
+
def baseline_path(self):
return self._webkit_baseline_path(self._name)
@@ -90,8 +90,8 @@ class ChromiumPort(base.Port):
result = True
dump_render_tree_binary_path = self._path_to_driver()
- result = check_file_exists(dump_render_tree_binary_path,
- 'test driver') and result
+ result = self._check_file_exists(dump_render_tree_binary_path,
+ 'test driver') and result
if result and self.get_option('build'):
result = self._check_driver_build_up_to_date(
self.get_option('configuration'))
@@ -100,8 +100,8 @@ class ChromiumPort(base.Port):
helper_path = self._path_to_helper()
if helper_path:
- result = check_file_exists(helper_path,
- 'layout test helper') and result
+ result = self._check_file_exists(helper_path,
+ 'layout test helper') and result
if self.get_option('pixel_tests'):
result = self.check_image_diff(
@@ -132,8 +132,8 @@ class ChromiumPort(base.Port):
def check_image_diff(self, override_step=None, logging=True):
image_diff_path = self._path_to_image_diff()
- return check_file_exists(image_diff_path, 'image diff exe',
- override_step, logging)
+ return self._check_file_exists(image_diff_path, 'image diff exe',
+ override_step, logging)
def diff_image(self, expected_contents, actual_contents,
diff_filename=None):
@@ -353,7 +353,7 @@ class ChromiumDriver(base.Driver):
self._worker_number = worker_number
self._image_path = None
if self._port.get_option('pixel_tests'):
- self._image_path = self._filesystem.join(
+ self._image_path = self._port._filesystem.join(
self._port.get_option('results_directory'),
'png_result%s.png' % self._worker_number)
@@ -445,8 +445,8 @@ class ChromiumDriver(base.Driver):
def _output_image(self):
"""Returns the image output which driver generated."""
png_path = self._image_path
- if png_path and self._filesystem.isfile(png_path):
- return self._filesystem.read_binary_file(png_path)
+ if png_path and self._port._filesystem.isfile(png_path):
+ return self._port._filesystem.read_binary_file(png_path)
else:
return None
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
index 79741b2..4fddd83 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
@@ -93,9 +93,9 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
return os.path.join(base, 'out', *comps)
def _check_apache_install(self):
- result = chromium.check_file_exists(self._path_to_apache(),
+ result = self._check_file_exists(self._path_to_apache(),
"apache2")
- result = chromium.check_file_exists(self._path_to_apache_config_file(),
+ result = self._check_file_exists(self._path_to_apache_config_file(),
"apache2 config file") and result
if not result:
_log.error(' Please install using: "sudo apt-get install '
@@ -104,11 +104,11 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
return result
def _check_lighttpd_install(self):
- result = chromium.check_file_exists(
+ result = self._check_file_exists(
self._path_to_lighttpd(), "LigHTTPd executable")
- result = chromium.check_file_exists(self._path_to_lighttpd_php(),
+ result = self._check_file_exists(self._path_to_lighttpd_php(),
"PHP CGI executable") and result
- result = chromium.check_file_exists(self._path_to_lighttpd_modules(),
+ result = self._check_file_exists(self._path_to_lighttpd_modules(),
"LigHTTPd modules") and result
if not result:
_log.error(' Please install using: "sudo apt-get install '
@@ -117,7 +117,7 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
return result
def _check_wdiff_install(self):
- result = chromium.check_file_exists(self._path_to_wdiff(), 'wdiff')
+ result = self._check_file_exists(self._path_to_wdiff(), 'wdiff')
if not result:
_log.error(' Please install using: "sudo apt-get install '
'wdiff"')
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list