diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 07:00:38 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 07:00:38 +0000 |
| commit | f4282f941bcd8a2db0b9df9a6ea1cee795402657 (patch) | |
| tree | e5a4c37d25e33d4cfe39c2bbb476a611807c2769 /webkit/tools | |
| parent | 1152b7ea95609ce835bdb9ab4454b4589b60ea87 (diff) | |
| download | chromium_src-f4282f941bcd8a2db0b9df9a6ea1cee795402657.zip chromium_src-f4282f941bcd8a2db0b9df9a6ea1cee795402657.tar.gz chromium_src-f4282f941bcd8a2db0b9df9a6ea1cee795402657.tar.bz2 | |
Reapply r25885 after master restart
Replace test_shell_tests dependency on the test_shell with test_shell_pak dependency.
This fixes the missing requirement that test_shell was previously satisifying for test_shell_tests.
TBR:sgk
Review URL: http://codereview.chromium.org/203051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 64 |
1 files changed, 41 insertions, 23 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index f14f4c5..585e38d 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -187,6 +187,45 @@ ], }, { + 'target_name': 'test_shell_pak', + 'type': 'none', + 'variables': { + 'repack_path': '../../../tools/data_pack/repack.py', + 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', + }, + 'conditions': [ + ['OS=="linux"', { + 'actions': [ + { + 'action_name': 'test_shell_repack', + 'variables': { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(pak_path)', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], + }, + ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': ['<(pak_path)'], + }, + ], + }], + ], + }, + { 'target_name': 'test_shell', 'type': 'executable', 'mac_bundle': 1, @@ -237,27 +276,7 @@ 'dependencies': [ '../../../build/linux/system.gyp:gtk', 'test_shell_resources', - ], - 'actions': [ - { - 'action_name': 'test_shell_repack', - 'inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/repack/test_shell.pak', - ], - 'action': ['python', '../../../tools/data_pack/repack.py', '<@(_outputs)', '<@(_inputs)'], - }, - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': ['<(INTERMEDIATE_DIR)/repack/test_shell.pak'], - }, + 'test_shell_pak', ], }], ['OS=="mac"', { @@ -376,8 +395,7 @@ }], ['OS=="linux"', { 'dependencies': [ - # Linux tests use the built test_shell beside the test - 'test_shell', + 'test_shell_pak', '../../../build/linux/system.gyp:gtk', ], 'sources!': [ |