diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 13:07:51 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 13:07:51 +0000 |
commit | a61fda5566acfcec22ed5961b8fa2d4c882be767 (patch) | |
tree | 4464ff3a9bbfb61efaab226741bca748798cb87b /build/temp_gyp/googleurl.gyp | |
parent | b000f75ee1fc7ea70dd7bfeb26b3542fced5540a (diff) | |
download | chromium_src-a61fda5566acfcec22ed5961b8fa2d4c882be767.zip chromium_src-a61fda5566acfcec22ed5961b8fa2d4c882be767.tar.gz chromium_src-a61fda5566acfcec22ed5961b8fa2d4c882be767.tar.bz2 |
Switch the build over to using the base test runner to make sure base and ICU are started up right.
BUG=72633
TEST=none
Review URL: http://codereview.chromium.org/6538022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/temp_gyp/googleurl.gyp')
-rw-r--r-- | build/temp_gyp/googleurl.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 9a2eda3..8bf7cce 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -70,6 +70,8 @@ 'target_name': 'googleurl_unittests', 'dependencies': [ 'googleurl', + '../../base/base.gyp:base_i18n', + '../../base/base.gyp:test_support_base', '../../testing/gtest.gyp:gtest', '../../third_party/icu/icu.gyp:icuuc', ], @@ -79,7 +81,9 @@ '../../googleurl/src/url_parse_unittest.cc', '../../googleurl/src/url_test_utils.h', '../../googleurl/src/url_util_unittest.cc', - '../../googleurl/src/gurl_test_main.cc', + # Make sure base and ICU are started up the 'Chromium way' since the + # build is using the Chromium base & ICU. + '../../base/test/run_all_unittests.cc', ], 'conditions': [ ['OS=="linux" or OS=="freebsd"', { |