diff options
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 12 | ||||
| -rw-r--r-- | testing/buildbot/gn_isolate_map.pyl | 9 | ||||
| -rw-r--r-- | third_party/libphonenumber/BUILD.gn | 12 | ||||
| -rw-r--r-- | third_party/libphonenumber/libphonenumber.gyp | 24 | ||||
| -rw-r--r-- | third_party/libphonenumber/libphonenumber_unittests.isolate | 20 |
7 files changed, 94 insertions, 7 deletions
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 8f9d3e8..d851938 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -770,6 +770,12 @@ "test": "jingle_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "libphonenumber_unittests" + }, + { "test": "mash_unittests" }, { @@ -1205,6 +1211,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "libphonenumber_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "media_blink_unittests" }, { diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 9b29c59..8df26a9 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -203,6 +203,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "libphonenumber_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "media_blink_unittests" }, { @@ -1152,6 +1158,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "libphonenumber_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "media_blink_unittests" }, { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 5465281..2bdafb8 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -214,6 +214,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "libphonenumber_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "media_blink_unittests" }, { @@ -1436,6 +1442,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "libphonenumber_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "media_blink_unittests" }, { diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index efe5c9d..02cc65e 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -324,11 +324,10 @@ #"label": "//third_party/libaddressinput:libaddressinput_unittests", #"type": "console_test_launcher", #}, - # See http://crbug.com/585151 - #"libphonenumber_unittests": { - #"label": "//third_party/libphonenumber:libphonenumber_unittests", - #"type": "console_test_launcher", - #}, + "libphonenumber_unittests": { + "label": "//third_party/libphonenumber:libphonenumber_unittests", + "type": "console_test_launcher", + }, "media_unittests": { "label": "//media:media_unittests", "type": "windowed_test_launcher", diff --git a/third_party/libphonenumber/BUILD.gn b/third_party/libphonenumber/BUILD.gn index 0e979c0..de30e81 100644 --- a/third_party/libphonenumber/BUILD.gn +++ b/third_party/libphonenumber/BUILD.gn @@ -18,7 +18,10 @@ config("libphonenumber_config") { "dist/cpp/src", "$root_gen_dir/third_party/libphonenumber", ] - defines = [ "I18N_PHONENUMBERS_USE_ICU_REGEXP=1" ] + defines = [ + "I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS=1", + "I18N_PHONENUMBERS_USE_ICU_REGEXP=1", + ] if (!is_android) { defines += [ "I18N_PHONENUMBERS_NO_THREAD_SAFETY=1" ] } @@ -36,6 +39,7 @@ config("libphonenumber_config_internal") { # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber_without_metadata static_library("libphonenumber_without_metadata") { sources = [ + "dist/cpp/src/phonenumbers/alternate_format.cc", "dist/cpp/src/phonenumbers/asyoutypeformatter.cc", "dist/cpp/src/phonenumbers/base/strings/string_piece.cc", "dist/cpp/src/phonenumbers/default_logger.cc", @@ -99,15 +103,21 @@ test("libphonenumber_unittests") { "dist/cpp/test/phonenumbers/phonenumbermatcher_test.cc", "dist/cpp/test/phonenumbers/phonenumberutil_test.cc", "dist/cpp/test/phonenumbers/regexp_adapter_test.cc", + "dist/cpp/test/phonenumbers/regexp_cache_test.cc", "dist/cpp/test/phonenumbers/stringutil_test.cc", "dist/cpp/test/phonenumbers/test_util.cc", "dist/cpp/test/phonenumbers/unicodestring_test.cc", + "dist/cpp/test/phonenumbers/utf/unicodetext_test.cc", ] configs += [ ":libphonenumber_config_internal" ] include_dirs = [ "dist/cpp/test" ] + data = [ + "dist/resources/test/", + ] + deps = [ ":libphonenumber_without_metadata", "//base", diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp index e89f48e..4167712 100644 --- a/third_party/libphonenumber/libphonenumber.gyp +++ b/third_party/libphonenumber/libphonenumber.gyp @@ -128,9 +128,11 @@ 'dist/cpp/test/phonenumbers/phonenumbermatcher_test.cc', 'dist/cpp/test/phonenumbers/phonenumberutil_test.cc', 'dist/cpp/test/phonenumbers/regexp_adapter_test.cc', + 'dist/cpp/test/phonenumbers/regexp_cache_test.cc', 'dist/cpp/test/phonenumbers/stringutil_test.cc', 'dist/cpp/test/phonenumbers/test_util.cc', 'dist/cpp/test/phonenumbers/unicodestring_test.cc', + 'dist/cpp/test/phonenumbers/utf/unicodetext_test.cc', ], 'dependencies': [ '../icu/icu.gyp:icui18n', @@ -160,5 +162,25 @@ ], }], ], - }] + }], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'libphonenumber_unittests_run', + 'type': 'none', + 'dependencies': [ + 'libphonenumber_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + 'libphonenumber_unittests.isolate', + ], + }, + ], + }, { + }], + ], } diff --git a/third_party/libphonenumber/libphonenumber_unittests.isolate b/third_party/libphonenumber/libphonenumber_unittests.isolate new file mode 100644 index 0000000..8785ff3 --- /dev/null +++ b/third_party/libphonenumber/libphonenumber_unittests.isolate @@ -0,0 +1,20 @@ +# Copyright (c) 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/libphonenumber_unittests<(EXECUTABLE_SUFFIX)', + ], + 'files': [ + 'dist/resources/test/', + ], + }, + }], + ], + 'includes': [ + '../../base/base.isolate', + ], +}
\ No newline at end of file |