diff options
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 12 | ||||
| -rw-r--r-- | tools/imagediff/image_diff.cc (renamed from chrome/tools/test/image_diff/image_diff.cc) | 0 | ||||
| -rw-r--r-- | tools/imagediff/image_diff.gyp | 24 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 3 |
5 files changed, 28 insertions, 13 deletions
diff --git a/build/all.gyp b/build/all.gyp index d33d1f6..0c26c2d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -95,7 +95,7 @@ 'target_name': 'build_for_layout_tests', 'type': 'none', 'dependencies': [ - '../chrome/chrome.gyp:image_diff', + '../tools/imagediff/image_diff.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 14570e3..a3632a2f 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3311,18 +3311,6 @@ ], }, { - '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/chrome/tools/test/image_diff/image_diff.cc b/tools/imagediff/image_diff.cc index 044b89c..044b89c 100644 --- a/chrome/tools/test/image_diff/image_diff.cc +++ b/tools/imagediff/image_diff.cc diff --git a/tools/imagediff/image_diff.gyp b/tools/imagediff/image_diff.gyp new file mode 100644 index 0000000..0448f7c --- /dev/null +++ b/tools/imagediff/image_diff.gyp @@ -0,0 +1,24 @@ +# 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/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 539ad34..330bb01 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -183,6 +183,8 @@ 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9', 'dependencies': [ 'test_shell_common', + 'npapi_layout_test_plugin', + '../../../tools/imagediff/image_diff.gyp:image_diff', ], 'sources': [ 'test_shell_main.cc', @@ -206,6 +208,7 @@ }, 'conditions': [ ['OS=="win"', { + 'dependencies': ['test_worker'], 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', ], |