Revert of [Testing] Run libaddressinput_unittests on bots (patchset c…

…hromium#13 id:350001 of https://codereview.chromium.org/1681663002/ ) Reason for revert: Reverting, this caused the test to fail on the Dr Memory bots (where it was running fine prior to this change). https://build.chromium.org/p/chromium.memory.fyi/builders/Windows%20Unit%20(DrMemory%20full)%20(3)/builds/9557/steps/memory%20test%3A%20addressinput/logs/stdio Original issue's description: > [Testing] Run libaddressinput_unittests on bots > > BUG=585151 > TEST=bots TBR=maruel@chromium.org,thakis@chromium.org,mathp@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=585151 Review URL: https://codereview.chromium.org/1693813003 Cr-Commit-Position: refs/heads/master@{#375309}
marcosholgado · Feb 13, 2016 · 5e23366 · 5e23366
1 parent 7537a27
commit 5e23366
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 168 deletions.
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
@@ -585,7 +585,6 @@
             '../third_party/WebKit/Source/web/web_tests.gyp:webkit_unit_tests_run',
             '../third_party/WebKit/Source/wtf/wtf_tests.gyp:wtf_unittests_run',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
-            '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests_run',
             '../tools/battor_agent/battor_agent.gyp:battor_agent_unittests_run',
             '../tools/gn/gn.gyp:gn_unittests_run',
             '../ui/accessibility/accessibility.gyp:accessibility_unittests_run',

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
@@ -775,12 +775,6 @@
         },
         "test": "jingle_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "libaddressinput_unittests"
-      },
       {
         "test": "mash_unittests"
       },
@@ -1204,12 +1198,6 @@
         },
         "test": "jingle_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "libaddressinput_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
@@ -195,12 +195,6 @@
         },
         "test": "jingle_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "libaddressinput_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1803,12 +1797,6 @@
         },
         "test": "jingle_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "libaddressinput_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
@@ -201,12 +201,6 @@
       {
         "test": "keyboard_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "libaddressinput_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1101,12 +1095,6 @@
         },
         "test": "jingle_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "libaddressinput_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
@@ -310,10 +310,11 @@
     "label": "//ui/keyboard:keyboard_unittests",
     "type": "unknown",
   },
-  "libaddressinput_unittests": {
-    "label": "//third_party/libaddressinput:libaddressinput_unittests",
-    "type": "console_test_launcher",
-  },
+  # See http://crbug.com/585151
+  #"libaddressinput_unittests": {
+    #"label": "//third_party/libaddressinput:libaddressinput_unittests",
+    #"type": "console_test_launcher",
+  #},
   # See http://crbug.com/585151
   #"libphonenumber_unittests": {
     #"label": "//third_party/libphonenumber:libphonenumber_unittests",

diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
@@ -186,51 +186,34 @@ if (!is_android || use_aura) {
     ]
   }
 
-  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",
-      ]
-    }
-  }
+  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",
+    ]
 
-  # 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\"" ]
-  }
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
 
-  # Used only for swarming.
-  unittests("libaddressinput_unittests") {
-    defines = [ "TEST_DATA_DIR=\"" + rebase_path("../..", root_out_dir) +
-                "/third_party/libaddressinput/src/testdata\"" ]
+    defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ]
+
+    include_dirs = [ "src/cpp/src" ]
+
+    deps = [
+      ":libaddressinput",
+      ":strings",
+      "//base/test:run_all_unittests",
+      "//components/prefs",
+      "//net:test_support",
+      "//testing/gtest",
+    ]
   }
 }
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
@@ -4,6 +4,7 @@
 {
   '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',
@@ -121,43 +122,34 @@
       ],
     },
     {
-      'target_name': 'libaddressinput_unittests_local',
-      'defines': [
-        'TEST_DATA_DIR="src/third_party/libaddressinput/src/testdata/"',
-      ],
-      'includes': [
-        'libaddressinput_unittests.gypi',
-      ],
-    },
-    {
-      # Only used for swarming (do not run locally).
       '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',
+      ],
       'defines': [
-        'TEST_DATA_DIR="src/testdata/"',
+        'TEST_DATA_DIR="<(libaddressinput_test_data_dir)"',
       ],
-      'includes': [
-        'libaddressinput_unittests.gypi',
+      'include_dirs': [
+        '../../',
+        'src/cpp/src/',
       ],
-    },
-  ],
-  'conditions': [
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'libaddressinput_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'libaddressinput_unittests',
-          ],
-          'includes': [
-            '../../build/isolate.gypi',
-          ],
-          'sources': [
-            'libaddressinput_unittests.isolate',
-          ],
-        },
+      '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.gypi b/third_party/libaddressinput/libaddressinput_unittests.gypi
diff --git a/third_party/libaddressinput/libaddressinput_unittests.isolate b/third_party/libaddressinput/libaddressinput_unittests.isolate