Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1005)

Side by Side Diff: Source/web/web.gyp

Issue 412683003: Switch webkit_unit_tests to use the new test launcher. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix gyp for non-component Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/WebUnitTests.cpp ('k') | Source/web/web.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 99 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
100 '<(libjpeg_gyp_path):libjpeg', 100 '<(libjpeg_gyp_path):libjpeg',
101 # We must not add webkit_support here because of cyclic dependency. 101 # We must not add webkit_support here because of cyclic dependency.
102 ], 102 ],
103 'export_dependent_settings': [ 103 'export_dependent_settings': [
104 '<(DEPTH)/url/url.gyp:url_lib', 104 '<(DEPTH)/url/url.gyp:url_lib',
105 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 105 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
106 ], 106 ],
107 'sources': [ 107 'sources': [
108 # Compile Blink unittest files into blink_web.dll in com ponent build mode 108 # Compile Blink unittest files into blink_web.dll in com ponent build mode
109 # since there're methods that are tested but not exporte d.
110 # WebUnitTests.* exports an API that runs all the unitte sts inside
111 # blink_web.dll.
112 '<@(bindings_unittest_files)', 109 '<@(bindings_unittest_files)',
113 '<@(core_unittest_files)', 110 '<@(core_unittest_files)',
114 '<@(modules_unittest_files)', 111 '<@(modules_unittest_files)',
115 # FIXME: the next line should not be needed. We prefer t o run these unit tests outside blink_web.dll. 112 # FIXME: the next line should not be needed. We prefer t o run these unit tests outside blink_web.dll.
116 '<@(platform_web_unittest_files)', 113 '<@(platform_web_unittest_files)',
117 '<@(web_unittest_files)', 114 '<@(web_unittest_files)',
118 'WebTestingSupport.cpp', 115 'WebTestingSupport.cpp',
119 'tests/WebUnitTests.cpp', # Components test runner sup port.
120 ], 116 ],
121 'conditions': [ 117 'conditions': [
122 ['OS=="win" or OS=="mac"', { 118 ['OS=="win" or OS=="mac"', {
123 'dependencies': [ 119 'dependencies': [
124 '<(DEPTH)/third_party/nss/nss.gyp:*', 120 '<(DEPTH)/third_party/nss/nss.gyp:*',
125 ], 121 ],
126 }], 122 }],
127 ['clang==1', { 123 ['clang==1', {
128 # FIXME: It would be nice to enable this in shared b uilds too, 124 # FIXME: It would be nice to enable this in shared b uilds too,
129 # but the test files have global constructors from t he GTEST macro 125 # but the test files have global constructors from t he GTEST macro
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 ['clang==1', { 249 ['clang==1', {
254 'target_defaults': { 250 'target_defaults': {
255 'cflags': ['-Wglobal-constructors'], 251 'cflags': ['-Wglobal-constructors'],
256 'xcode_settings': { 252 'xcode_settings': {
257 'WARNING_CFLAGS': ['-Wglobal-constructors'], 253 'WARNING_CFLAGS': ['-Wglobal-constructors'],
258 }, 254 },
259 }, 255 },
260 }], 256 }],
261 ], # conditions 257 ], # conditions
262 } 258 }
OLDNEW
« no previous file with comments | « Source/web/tests/WebUnitTests.cpp ('k') | Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698