diff options
-rw-r--r-- | build/all.gyp | 36 | ||||
-rw-r--r-- | build/temp_gyp/googleurl.gyp | 34 | ||||
-rw-r--r-- | chrome/chrome_tests.gypi | 14 | ||||
-rw-r--r-- | url/url.gyp | 62 |
4 files changed, 87 insertions, 59 deletions
diff --git a/build/all.gyp b/build/all.gyp index f2f6853..85dc8a9 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -203,7 +203,7 @@ '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', '../ui/ui.gyp:ui_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../url/url.gyp:googleurl_unittests', ], 'conditions': [ ['OS!="ios"', { @@ -446,7 +446,6 @@ '../content/content.gyp:content_browsertests', '../content/content.gyp:content_unittests', '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -459,8 +458,9 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/ui.gyp:ui_unittests', + '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -478,7 +478,6 @@ '../content/content.gyp:content_browsertests', '../content/content.gyp:content_unittests', '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -490,8 +489,9 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/ui.gyp:ui_unittests', + '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -501,15 +501,15 @@ '../base/base.gyp:base_unittests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../crypto/crypto.gyp:crypto_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', - '../net/net.gyp:net_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../url/url.gyp:googleurl_unittests', ], }, { @@ -526,24 +526,24 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_unittests', + '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', + '../components/components.gyp:components_unittests', + '../content/content.gyp:content_unittests', '../crypto/crypto.gyp:crypto_unittests', + '../device/device.gyp:device_unittests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../chrome/chrome.gyp:unit_tests', - '../components/components.gyp:components_unittests', - '../content/content.gyp:content_unittests', - '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', - '../jingle/jingle.gyp:jingle_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../ui/ui.gyp:ui_unittests', + '../url/url.gyp:googleurl_unittests', ], }, ], # targets @@ -575,7 +575,6 @@ '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../courgette/courgette.gyp:courgette_unittests', '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -587,10 +586,11 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/ui.gyp:ui_unittests', '../ui/views/views.gyp:views_unittests', + '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ], 'conditions': [ ['target_arch!="x64"', { @@ -645,7 +645,7 @@ '../sql/sql.gyp:sql_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../url/url.gyp:googleurl_unittests', ], }, { @@ -668,7 +668,7 @@ '../sql/sql.gyp:sql_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../url/url.gyp:googleurl_unittests', ], }, { diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 2f6f89a..be5bc55 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -71,39 +71,5 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, - { - 'target_name': 'googleurl_unittests', - 'type': 'executable', - 'dependencies': [ - 'googleurl', - '../../base/base.gyp:base_i18n', - '../../base/base.gyp:run_all_unittests', - '../../testing/gtest.gyp:gtest', - '../../third_party/icu/icu.gyp:icuuc', - ], - 'sources': [ - '../../googleurl/src/gurl_unittest.cc', - '../../googleurl/src/url_canon_unittest.cc', - '../../googleurl/src/url_parse_unittest.cc', - '../../googleurl/src/url_test_utils.h', - '../../googleurl/src/url_util_unittest.cc', - ], - 'defines': [ - 'FULL_FILESYSTEM_URL_SUPPORT=1', - ], - 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios"', { - 'conditions': [ - ['linux_use_tcmalloc==1', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, ], } diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 2722770..f6f0b8f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3152,20 +3152,20 @@ 'interactive_ui_tests', # Disabled from running in coverage_posix.py. # We need to build this during compile step, so enabling here. - 'browser_tests', + '../content/content.gyp:content_browsertests', '../courgette/courgette.gyp:courgette_unittests', '../crypto/crypto.gyp:crypto_unittests', - 'chromedriver_unittests', - '../build/temp_gyp/googleurl.gyp:googleurl_unittests', - 'gpu_tests', '../jingle/jingle.gyp:jingle_unittests', '../net/net.gyp:net_perftests', + '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests', + '../url/url.gyp:googleurl_unittests', + 'browser_tests', + 'chromedriver_unittests', + 'gpu_tests', 'performance_ui_tests', + 'pyautolib', 'reliability_tests', 'sync_integration_tests', - '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests', - 'pyautolib', - '../content/content.gyp:content_browsertests', ]}], ['OS=="mac"', { 'dependencies': [ diff --git a/url/url.gyp b/url/url.gyp index 4f86e5d..aff709e 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -95,5 +95,67 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, + { + # url_unittests was formerly named googleurl_unittests. While the build + # bots are being switched to use the new name we need to support both + # executables. + # TODO(tfarina): Remove this target when build bots are building and + # running url_unittests. crbug.com/229660 + 'target_name': 'googleurl_unittests', + 'type': 'none', + 'dependencies': [ + 'url_unittests', + ], + 'conditions': [ + ['OS != "ios"', + { + 'actions': [ + { + 'message': 'TEMPORARY: Copying url_unittests to googleurl_unittests', + 'action_name': 'copy_url_unittests', + 'variables': { + 'source_file': '<(PRODUCT_DIR)/url_unittests<(EXECUTABLE_SUFFIX)', + 'dest_file': '<(PRODUCT_DIR)/googleurl_unittests<(EXECUTABLE_SUFFIX)', + }, + 'inputs': [ + '../build/cp.py', + '<(source_file)', + ], + 'outputs': [ + '<(dest_file)', + ], + 'action': [ + 'python', '../build/cp.py', '<(source_file)', '<(dest_file)', + ], + }, + ], + } + ], + ['OS == "ios"', + { + 'actions': [ + { + 'message': 'TEMPORARY: Copying url_unittests to googleurl_unittests', + 'action_name': 'copy_url_unittests', + 'variables': { + 'source_file': '<(PRODUCT_DIR)/url_unittests.app/url_unittests', + 'dest_file': '<(PRODUCT_DIR)/googleurl_unittests.app/googleurl_unittests', + }, + 'inputs': [ + '../build/cp.py', + '<(source_file)', + ], + 'outputs': [ + '<(dest_file)', + ], + 'action': [ + 'python', '../build/cp.py', '<(source_file)', '<(dest_file)', + ], + }, + ], + } + ] + ], + }, ], } |