diff options
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 12 | ||||
| -rw-r--r-- | chrome/tools/test/image_diff/image_diff.cc (renamed from tools/image_diff/image_diff.cc) | 0 | ||||
| -rw-r--r-- | tools/image_diff/image_diff.gyp | 24 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_types/image_diff.py | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 5 |
6 files changed, 14 insertions, 33 deletions
diff --git a/build/all.gyp b/build/all.gyp index b461d6b..d33d1f6 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -95,7 +95,7 @@ 'target_name': 'build_for_layout_tests', 'type': 'none', 'dependencies': [ - '../tools/image_diff/image_diff.gyp:image_diff', + '../chrome/chrome.gyp:image_diff', '../webkit/tools/test_shell/test_shell.gyp:test_shell', '../webkit/tools/test_shell/test_shell.gyp:test_shell_tests', ], diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 58ca846..bf184df 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3290,6 +3290,18 @@ ], }, { + 'target_name': 'image_diff', + 'type': 'executable', + 'msvs_guid': '50B079C7-CD01-42D3-B8C4-9F8D9322E822', + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:base_gfx', + ], + 'sources': [ + 'tools/test/image_diff/image_diff.cc', + ], + }, + { # This target contains mocks and test utilities that don't belong in # production libraries but are used by more than one test executable. 'target_name': 'test_support_common', diff --git a/tools/image_diff/image_diff.cc b/chrome/tools/test/image_diff/image_diff.cc index 044b89c..044b89c 100644 --- a/tools/image_diff/image_diff.cc +++ b/chrome/tools/test/image_diff/image_diff.cc diff --git a/tools/image_diff/image_diff.gyp b/tools/image_diff/image_diff.gyp deleted file mode 100644 index 0448f7c..0000000 --- a/tools/image_diff/image_diff.gyp +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'includes': [ - '../../build/common.gypi', - ], - 'targets' : [ - { - 'target_name': 'image_diff', - 'type': 'executable', - 'msvs_guid': '50B079C7-CD01-42D3-B8C4-9F8D9322E822', - 'dependencies': [ - '../../base/base.gyp:base', - '../../base/base.gyp:base_gfx', - ], - 'sources': [ - 'image_diff.cc', - ], - }, - ], -} - diff --git a/webkit/tools/layout_tests/test_types/image_diff.py b/webkit/tools/layout_tests/test_types/image_diff.py index 7e32a78..684c582 100644 --- a/webkit/tools/layout_tests/test_types/image_diff.py +++ b/webkit/tools/layout_tests/test_types/image_diff.py @@ -93,10 +93,6 @@ class ImageDiff(test_type_base.TestTypeBase): _compare_available = False else: raise e - except ValueError: - # work around a race condition in Python 2.4's implementation of - # subprocess.Popen - pass global _compare_msg_printed diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 31a8eed..539ad34 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -183,8 +183,6 @@ 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9', 'dependencies': [ 'test_shell_common', - 'npapi_layout_test_plugin', - '../../../tools/image_diff/image_diff.gyp:image_diff', ], 'sources': [ 'test_shell_main.cc', @@ -208,7 +206,6 @@ }, 'conditions': [ ['OS=="win"', { - 'dependencies': ['test_worker'], 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', ], @@ -253,7 +250,7 @@ }], ['OS=="mac"', { 'product_name': 'TestShell', - 'dependencies': ['layout_test_helper','test_worker'], + 'dependencies': ['layout_test_helper'], 'variables': { 'repack_path': '../../../tools/data_pack/repack.py', }, |