[Testing] Run libaddressinput_unittests on bots

BUG=585151
TEST=bots

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

Cr-Commit-Position: refs/heads/master@{#374933}

4 files changed, 127 insertions, 52 deletions

diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
index 4132f14..f8af1ec 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -186,34 +186,51 @@ if (!is_android || use_aura) {
     ]
   }
 
-  test("libaddressinput_unittests") {
-    sources =
-        rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp")
-    sources += [
-      "chromium/addressinput_util_unittest.cc",
-      "chromium/chrome_address_validator_unittest.cc",
-      "chromium/chrome_metadata_source_unittest.cc",
-      "chromium/chrome_storage_impl_unittest.cc",
-      "chromium/fallback_data_store_unittest.cc",
-      "chromium/storage_test_runner.cc",
-      "chromium/string_compare_unittest.cc",
-      "chromium/trie_unittest.cc",
-    ]
-
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ "//build/config/compiler:no_chromium_code" ]
-
-    defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ]
+  template("unittests") {
+    test(target_name) {
+      sources =
+          rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp")
+      sources += [
+        "chromium/addressinput_util_unittest.cc",
+        "chromium/chrome_address_validator_unittest.cc",
+        "chromium/chrome_metadata_source_unittest.cc",
+        "chromium/chrome_storage_impl_unittest.cc",
+        "chromium/fallback_data_store_unittest.cc",
+        "chromium/storage_test_runner.cc",
+        "chromium/string_compare_unittest.cc",
+        "chromium/trie_unittest.cc",
+      ]
+      data = [
+        "src/testdata/",
+      ]
+
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+
+      defines = invoker.defines
+
+      include_dirs = [ "src/cpp/src" ]
+
+      deps = [
+        ":libaddressinput",
+        ":strings",
+        "//base/test:run_all_unittests",
+        "//components/prefs",
+        "//net:test_support",
+        "//testing/gtest",
+      ]
+    }
+  }
 
-    include_dirs = [ "src/cpp/src" ]
+  # Can be used to run tests locally, from the checkout directory (not src).
+  unittests("libaddressinput_unittests_local") {
+    defines =
+        [ "TEST_DATA_DIR=\"src/third_party/libaddressinput/src/testdata\"" ]
+  }
 
-    deps = [
-      ":libaddressinput",
-      ":strings",
-      "//base/test:run_all_unittests",
-      "//components/prefs",
-      "//net:test_support",
-      "//testing/gtest",
-    ]
+  # Used only for swarming.
+  unittests("libaddressinput_unittests") {
+    defines = [ "TEST_DATA_DIR=\"" + rebase_path("../..", root_out_dir) +
+                "/third_party/libaddressinput/src/testdata\"" ]
   }
 }
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
index 4dc9efb..b167579 100644
--- a/third_party/libaddressinput/libaddressinput.gyp
+++ b/third_party/libaddressinput/libaddressinput.gyp
@@ -4,7 +4,6 @@
 {
   'includes': ['src/cpp/libaddressinput.gypi'],
   'variables': {
-    'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testdata',
     'libaddressinput_util_files': [
       'src/cpp/src/address_data.cc',
       'src/cpp/src/address_field.cc',
@@ -122,34 +121,43 @@
       ],
     },
     {
-      'target_name': 'libaddressinput_unittests',
-      'type': '<(gtest_target_type)',
-      'sources': [
-        '<@(libaddressinput_test_files)',
-        'chromium/addressinput_util_unittest.cc',
-        'chromium/chrome_address_validator_unittest.cc',
-        'chromium/chrome_metadata_source_unittest.cc',
-        'chromium/chrome_storage_impl_unittest.cc',
-        'chromium/fallback_data_store_unittest.cc',
-        'chromium/storage_test_runner.cc',
-        'chromium/string_compare_unittest.cc',
-        'chromium/trie_unittest.cc',
-      ],
+      'target_name': 'libaddressinput_unittests_local',
       'defines': [
-        'TEST_DATA_DIR="<(libaddressinput_test_data_dir)"',
+        'TEST_DATA_DIR="src/third_party/libaddressinput/src/testdata/"',
       ],
-      'include_dirs': [
-        '../../',
-        'src/cpp/src/',
+      'includes': [
+        'libaddressinput_unittests.gypi',
       ],
-      'dependencies': [
-        '../../base/base.gyp:run_all_unittests',
-        '../../components/prefs/prefs.gyp:prefs',
-        '../../net/net.gyp:net_test_support',
-        '../../testing/gtest.gyp:gtest',
-        'libaddressinput',
-        'libaddressinput_util',
+    },
+    {
+      # Only used for swarming (do not run locally).
+      'target_name': 'libaddressinput_unittests',
+      'defines': [
+        'TEST_DATA_DIR="src/testdata/"',
+      ],
+      'includes': [
+        'libaddressinput_unittests.gypi',
       ],
     },
   ],
+  'conditions': [
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'libaddressinput_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'libaddressinput_unittests',
+          ],
+          'includes': [
+            '../../build/isolate.gypi',
+          ],
+          'sources': [
+            'libaddressinput_unittests.isolate',
+          ],
+        },
+      ],
+    }, {
+    }],
+  ],
 }
diff --git a/third_party/libaddressinput/libaddressinput_unittests.gypi b/third_party/libaddressinput/libaddressinput_unittests.gypi
new file mode 100644
index 0000000..2334eb3
--- /dev/null
+++ b/third_party/libaddressinput/libaddressinput_unittests.gypi
@@ -0,0 +1,29 @@
+# Copyright 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.
+{
+  'type': '<(gtest_target_type)',
+  'sources': [
+    '<@(libaddressinput_test_files)',
+    'chromium/addressinput_util_unittest.cc',
+    'chromium/chrome_address_validator_unittest.cc',
+    'chromium/chrome_metadata_source_unittest.cc',
+    'chromium/chrome_storage_impl_unittest.cc',
+    'chromium/fallback_data_store_unittest.cc',
+    'chromium/storage_test_runner.cc',
+    'chromium/string_compare_unittest.cc',
+    'chromium/trie_unittest.cc',
+  ],
+  'include_dirs': [
+    '../../',
+    'src/cpp/src/',
+  ],
+  'dependencies': [
+    '../../base/base.gyp:run_all_unittests',
+    '../../components/prefs/prefs.gyp:prefs',
+    '../../net/net.gyp:net_test_support',
+    '../../testing/gtest.gyp:gtest',
+    'libaddressinput',
+    'libaddressinput_util',
+  ],
+}
diff --git a/third_party/libaddressinput/libaddressinput_unittests.isolate b/third_party/libaddressinput/libaddressinput_unittests.isolate
new file mode 100644
index 0000000..4f2bd60
--- /dev/null
+++ b/third_party/libaddressinput/libaddressinput_unittests.isolate
@@ -0,0 +1,21 @@
+# Copyright 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)/libaddressinput_unittests<(EXECUTABLE_SUFFIX)',
+        ],
+        'files': [
+          '<(PRODUCT_DIR)/libaddressinput_unittests<(EXECUTABLE_SUFFIX)',
+          'src/testdata/',
+        ],
+      },
+    }],
+  ],
+  'includes': [
+    '../../base/base.isolate',
+  ],
+}