Skip to content

GitLab

T
tangled
Commit b06b39cb authored by gavinp@chromium.org's avatar gavinp@chromium.org
Browse files
Options

Revert 195389 "url: Copy 'googleurl_unittests' target from 'url_..." 

> url: Copy 'googleurl_unittests' target from 'url_unittests'. Attempt 2.
> 
> To not break the buildbot, this creates a fake target that copies url_unittests
> to googleurl_unittests as temporary scaffolding.
> 
> BUG=229660
> R=brettw@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/14199009

TBR=tfarina@chromium.org

Review URL: https://codereview.chromium.org/14028022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195392 0039d316-1c4b-4281-b951-d872f2087c98
parent c8ff7c9e
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 80 deletions
build/all.gyp
View file @ b06b39cb
......@@ -203,7 +203,7 @@
'../net/net.gyp:net_unittests',
'../sql/sql.gyp:sql_unittests',
'../ui/ui.gyp:ui_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
'conditions': [
['OS!="ios"', {
......@@ -445,6 +445,7 @@
'../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',
......@@ -457,9 +458,8 @@
'../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',
],
},
{
......@@ -477,6 +477,7 @@
'../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',
......@@ -488,9 +489,8 @@
'../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',
],
},
{
......@@ -500,15 +500,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',
],
},
{
......@@ -525,24 +525,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',
'../ui/ui.gyp:ui_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
], # targets
......@@ -574,6 +574,7 @@
'../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',
......@@ -585,11 +586,10 @@
'../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"', {
......@@ -644,7 +644,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
......@@ -667,7 +667,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
......
url/url.gyp
View file @ b06b39cb
......@@ -95,67 +95,5 @@
# 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)',
],
},
],
}
]
],
},
],
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment