diff options
52 files changed, 24 insertions, 598 deletions
@@ -462,8 +462,8 @@ group("both_gn_and_gyp") { # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:helper_nonsfi", - "//components/nacl/loader:helper_nonsfi_unittests", "//components/nacl/loader:nacl_helper", + "//components/nacl/loader:nacl_helper_nonsfi_unittests", ] } } diff --git a/base/BUILD.gn b/base/BUILD.gn index 83b7300..e099028 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1522,15 +1522,6 @@ if (is_win) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("base_unittests_run") { - testonly = true - deps = [ - ":base_unittests", - ] -} - test("base_unittests") { sources = [ "allocator/tcmalloc_unittest.cc", diff --git a/blimp/BUILD.gn b/blimp/BUILD.gn index b91c782..f8ee944 100644 --- a/blimp/BUILD.gn +++ b/blimp/BUILD.gn @@ -59,12 +59,3 @@ test("blimp_unittests") { deps += [ "//blimp/engine:unit_tests" ] } } - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("blimp_unittests_run") { - testonly = true - deps = [ - ":blimp_unittests", - ] -} diff --git a/cc/BUILD.gn b/cc/BUILD.gn index 0a166e0..6cbe28b 100644 --- a/cc/BUILD.gn +++ b/cc/BUILD.gn @@ -756,15 +756,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("cc_unittests_run") { - testonly = true - deps = [ - ":cc_unittests", - ] -} - test("cc_unittests") { sources = [ "animation/animation_host_unittest.cc", diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index fc73593..757fbbe 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -285,15 +285,6 @@ if (!is_android) { ] } - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("interactive_ui_tests_run") { - testonly = true - deps = [ - ":interactive_ui_tests", - ] - } - test("interactive_ui_tests") { sources = rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources, @@ -779,15 +770,6 @@ if (!is_android) { ] } - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("browser_tests_run") { - testonly = true - data_deps = [ - ":browser_tests", - ] - } - test("browser_tests") { sources = [ "base/browser_tests_main.cc", @@ -1275,15 +1257,6 @@ if (!is_android) { } } - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("sync_integration_tests_run") { - testonly = true - deps = [ - ":sync_integration_tests", - ] - } - test("sync_integration_tests") { sources = rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources, @@ -1482,15 +1455,6 @@ js2gtest("unit_tests_js") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("unit_tests_run") { - testonly = true - deps = [ - ":unit_tests", - ] -} - test("unit_tests") { sources = rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_sources, ".", diff --git a/chrome/test/chromedriver/BUILD.gn b/chrome/test/chromedriver/BUILD.gn index 435b634..1684a67 100644 --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn @@ -190,15 +190,6 @@ executable("chromedriver") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("chromedriver_unittests_run") { - testonly = true - deps = [ - ":chromedriver_unittests", - ] -} - test("chromedriver_unittests") { sources = rebase_path(chrome_tests_gypi_values.chrome_driver_unittests_sources, diff --git a/components/BUILD.gn b/components/BUILD.gn index 565b4d9..1ae5399 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -12,15 +12,6 @@ if (is_android) { import("//build/config/android/rules.gni") } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("components_unittests_run") { - testonly = true - deps = [ - ":components_unittests", - ] -} - # To add a unit test to this target, make a "unit_test" source_set in your # component (it's important to use a source_set instead of a static library or # no tests will run) and add a reference here. You can add more than one unit @@ -330,15 +321,6 @@ if (is_android) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("components_browsertests_run") { - testonly = true - deps = [ - ":components_browsertests", - ] -} - test("components_browsertests") { sources = [] defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] diff --git a/components/nacl/loader/BUILD.gn b/components/nacl/loader/BUILD.gn index 038fc37..6a8c161 100644 --- a/components/nacl/loader/BUILD.gn +++ b/components/nacl/loader/BUILD.gn @@ -71,15 +71,6 @@ source_set("loader") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("nacl_loader_unittests_run") { - testonly = true - deps = [ - ":nacl_loader_unittests", - ] -} - test("nacl_loader_unittests") { sources = [ "nacl_ipc_adapter_unittest.cc", @@ -156,29 +147,14 @@ if (is_linux) { "//base", "//base/test:test_launcher_nacl_nonsfi", ] - } - - group("helper_nonsfi") { data_deps = [ - ":nacl_helper_nonsfi_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)", - ] - } - - group("helper_nonsfi_unittests") { - testonly = true - data_deps = [ - ":nacl_helper_nonsfi_unittests", ":nacl_helper_nonsfi_unittests_main_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)", ] } - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("nacl_helper_nonsfi_unittests_run") { - testonly = true + group("helper_nonsfi") { data_deps = [ - ":helper_nonsfi_unittests", - ":nacl_helper_nonsfi_unittests_main_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)", + ":nacl_helper_nonsfi_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)", ] } } diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 6ee6369..c2467a7 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -339,15 +339,6 @@ if (is_android) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("content_browsertests_run") { - testonly = true - deps = [ - ":content_browsertests", - ] -} - test("content_browsertests") { sources = rebase_path(content_tests_gypi_values.content_browsertests_sources, ".", @@ -560,15 +551,6 @@ test("content_browsertests") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("content_unittests_run") { - testonly = true - deps = [ - ":content_unittests", - ] -} - test("content_unittests") { defines = [] sources = rebase_path(content_tests_gypi_values.content_unittests_sources, @@ -835,15 +817,6 @@ test("content_perftests") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("content_gl_tests_run") { - testonly = true - deps = [ - ":content_gl_tests", - ] -} - test("content_gl_tests") { sources = [ "../common/gpu/client/gl_helper_unittest.cc", diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index 34deeae..035e5cb 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -226,15 +226,6 @@ if (false && is_win) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("crypto_unittests_run") { - testonly = true - deps = [ - ":crypto_unittests", - ] -} - test("crypto_unittests") { sources = [ "aead_openssl_unittest.cc", diff --git a/device/BUILD.gn b/device/BUILD.gn index 2b68111..d72dd6f 100644 --- a/device/BUILD.gn +++ b/device/BUILD.gn @@ -16,15 +16,6 @@ if (is_mac) { is_linux_without_udev = is_linux && !use_udev is_linux_without_dbus = is_linux && !use_dbus -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("device_unittests_run") { - testonly = true - deps = [ - ":device_unittests", - ] -} - test("device_unittests") { sources = [ "battery/battery_status_manager_win_unittest.cc", diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index e3600d8..a624a45 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -141,15 +141,6 @@ repack("shell_and_test_pak") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("extensions_unittests_run") { - testonly = true - deps = [ - ":extensions_unittests", - ] -} - test("extensions_unittests") { sources = rebase_path(extensions_tests_gypi_values.extensions_unittests_sources, @@ -218,15 +209,6 @@ test("extensions_unittests") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("extensions_browsertests_run") { - testonly = true - deps = [ - ":extensions_browsertests", - ] -} - test("extensions_browsertests") { sources = rebase_path(extensions_tests_gypi_values.extensions_browsertests_sources, diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 52e3cab..a98d704 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -145,15 +145,6 @@ if (!(is_chromeos && !use_ozone)) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("app_shell_unittests_run") { - testonly = true - deps = [ - ":app_shell_unittests", - ] -} - test("app_shell_unittests") { sources = rebase_path(app_shell_gypi_values.app_shell_unittests_sources, ".", diff --git a/gin/BUILD.gn b/gin/BUILD.gn index 4531cd1..1ceeb60 100644 --- a/gin/BUILD.gn +++ b/gin/BUILD.gn @@ -202,12 +202,3 @@ test("gin_unittests") { ":gin_shell", ] } - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gin_unittests_run") { - testonly = true - deps = [ - ":gin_unittests", - ] -} diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn index 46048ff..d491b48 100644 --- a/google_apis/BUILD.gn +++ b/google_apis/BUILD.gn @@ -224,15 +224,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("google_apis_unittests_run") { - testonly = true - deps = [ - ":google_apis_unittests", - ] -} - test("google_apis_unittests") { sources = [ "gaia/gaia_auth_fetcher_unittest.cc", diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn index 30ab4a6..f63aefb 100644 --- a/google_apis/gcm/BUILD.gn +++ b/google_apis/gcm/BUILD.gn @@ -123,15 +123,6 @@ executable("mcs_probe") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gcm_unit_tests_run") { - testonly = true - deps = [ - ":gcm_unit_tests", - ] -} - test("gcm_unit_tests") { sources = [ "base/mcs_message_unittest.cc", diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index e02fa1a..63447f1 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -101,13 +101,6 @@ source_set("test_support") { ] } -group("gl_tests_run") { - testonly = true - deps = [ - ":gl_tests", - ] -} - test("gl_tests") { sources = [ "command_buffer/tests/compressed_texture_test.cc", @@ -177,15 +170,6 @@ test("gl_tests") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gpu_unittests_run") { - testonly = true - deps = [ - ":gpu_unittests", - ] -} - test("gpu_unittests") { sources = [ "command_buffer/client/buffer_tracker_unittest.cc", @@ -328,23 +312,3 @@ test("gpu_perftests") { "//ui/gl", ] } - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("angle_unittests_run") { - testonly = true - deps = [ - "//third_party/angle/src/tests:angle_unittests", - ] -} - -if (is_win || is_linux || is_mac) { - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("angle_end2end_tests_run") { - testonly = true - deps = [ - "//third_party/angle/src/tests:angle_end2end_tests", - ] - } -} diff --git a/gpu/gles2_conform_support/BUILD.gn b/gpu/gles2_conform_support/BUILD.gn index 06466583..2dd0e2a 100644 --- a/gpu/gles2_conform_support/BUILD.gn +++ b/gpu/gles2_conform_support/BUILD.gn @@ -174,15 +174,6 @@ if (internal_gles2_conform_tests) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gles2_conform_test_run") { - testonly = true - deps = [ - ":gles2_conform_test", - ] -} - test("gles2_conform_test") { sources = [ "gles2_conform_test.cc", diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn index 036ff19..8c7a351 100644 --- a/ipc/BUILD.gn +++ b/ipc/BUILD.gn @@ -144,13 +144,6 @@ source_set("param_traits") { ] } -group("ipc_tests_run") { - testonly = true - deps = [ - ":ipc_tests", - ] -} - test("ipc_tests") { sources = [ "attachment_broker_mac_unittest.cc", diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn index 10f2b2b..15f45e1 100644 --- a/jingle/BUILD.gn +++ b/jingle/BUILD.gn @@ -121,15 +121,6 @@ if (enable_webrtc || !is_android) { ] } - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("jingle_unittests_run") { - testonly = true - deps = [ - ":jingle_unittests", - ] - } - # GYP version: jingle/jingle.gyp:jingle_unittests test("jingle_unittests") { sources = [ diff --git a/media/BUILD.gn b/media/BUILD.gn index e8c0a87..b4d05e5 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -610,15 +610,6 @@ if (is_ios) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("media_unittests_run") { - testonly = true - deps = [ - ":media_unittests", - ] -} - test("media_unittests") { sources = [ "capture/content/animated_content_sampler_unittest.cc", @@ -839,15 +830,6 @@ test("media_perftests") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("audio_unittests_run") { - testonly = true - deps = [ - ":audio_unittests", - ] -} - # For running the subset of media_unittests that might require audio hardware # separately on GPU bots. media_unittests includes these too. test("audio_unittests") { diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn index 31140ce..daa405f 100644 --- a/media/blink/BUILD.gn +++ b/media/blink/BUILD.gn @@ -154,12 +154,3 @@ test("media_blink_unittests") { configs += [ "//v8:external_startup_data" ] } - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("media_blink_unittests_run") { - testonly = true - deps = [ - ":media_blink_unittests", - ] -} diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn index 92aa84e..10dfc2e 100644 --- a/media/cast/BUILD.gn +++ b/media/cast/BUILD.gn @@ -299,15 +299,6 @@ static_library("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("cast_unittests_run") { - testonly = true - deps = [ - ":cast_unittests", - ] -} - test("cast_unittests") { sources = [ "common/expanded_value_base_unittest.cc", diff --git a/media/midi/BUILD.gn b/media/midi/BUILD.gn index 59a8e9c..1f9a433 100644 --- a/media/midi/BUILD.gn +++ b/media/midi/BUILD.gn @@ -150,15 +150,6 @@ component("midi") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("midi_unittests_run") { - testonly = true - deps = [ - ":midi_unittests", - ] -} - test("midi_unittests") { sources = [ "midi_manager_unittest.cc", diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 8f0ee8d..554abd9c 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -27,46 +27,6 @@ group("mojo") { deps += [ "//mojo/shell:all" ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("mojo_public_bindings_unittests_run") { - testonly = true - deps = [ - # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_bindings_unittests" - "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", - ] -} - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("mojo_public_environment_unittests_run") { - testonly = true - deps = [ - # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_environment_unittests" - "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", - ] -} - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("mojo_public_system_unittests_run") { - testonly = true - deps = [ - # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_system_unittests" - "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", - ] -} - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("mojo_public_utility_unittests_run") { - testonly = true - deps = [ - # TODO(use_chrome_edk): "//mojo/edk/test:mojo_public_utility_unittests" - "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", - ] -} - group("tests") { testonly = true deps = [ diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn index 0278cf3..d541ae1 100644 --- a/mojo/common/BUILD.gn +++ b/mojo/common/BUILD.gn @@ -64,15 +64,6 @@ source_set("url_type_converters") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("mojo_common_unittests_run") { - testonly = true - deps = [ - ":mojo_common_unittests", - ] -} - # GYP version: mojo/mojo_base.gyp:mojo_common_unittests test("mojo_common_unittests") { deps = [ diff --git a/net/BUILD.gn b/net/BUILD.gn index 102c703..7d9dd890 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1369,15 +1369,6 @@ if (!is_ios) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("net_unittests_run") { - testonly = true - deps = [ - ":net_unittests", - ] -} - test("net_unittests") { sources = gypi_values.net_test_sources diff --git a/printing/BUILD.gn b/printing/BUILD.gn index 7690e50..985a626 100644 --- a/printing/BUILD.gn +++ b/printing/BUILD.gn @@ -196,15 +196,6 @@ component("printing") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("printing_unittests_run") { - testonly = true - deps = [ - ":printing_unittests", - ] -} - test("printing_unittests") { sources = [ "emf_win_unittest.cc", diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index 0667d03..df8f877 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -104,15 +104,6 @@ source_set("test_support") { # TODO(GYP) remoting_unittests on Mac. Needs to be tested. if (!is_mac) { - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("remoting_unittests_run") { - testonly = true - deps = [ - ":remoting_unittests", - ] - } - test("remoting_unittests") { configs += [ ":version", diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn index 341d363..b7d3bfe 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn @@ -192,7 +192,7 @@ action("bpf_dsl_golden") { rebase_path(outputs, root_build_dir) + rebase_path(inputs, root_build_dir) } -# TODO(GYP): Delete this after we've converted everything to GN. +# TODO(GYP): Delete these after we've converted everything to GN. # The _run targets exist only for compatibility w/ GYP. group("sandbox_linux_unittests_run") { testonly = true @@ -201,6 +201,15 @@ group("sandbox_linux_unittests_run") { ] } +if (is_android) { + group("sandbox_linux_unittests_apk_run") { + testonly = true + deps = [ + ":sandbox_linux_unittests", + ] + } +} + # The main sandboxing test target. "sandbox_linux_unittests" cannot use the # test() template because the test is run as an executable not as an APK on # Android. diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 0bee78c..af09b70 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -657,15 +657,6 @@ source_set("skia_opts") { visibility = [ ":skia" ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("skia_unittests_run") { - testonly = true - deps = [ - ":skia_unittests", - ] -} - test("skia_unittests") { sources = [ "ext/analysis_canvas_unittest.cc", diff --git a/sql/BUILD.gn b/sql/BUILD.gn index 18365e9..4ffa421 100644 --- a/sql/BUILD.gn +++ b/sql/BUILD.gn @@ -69,15 +69,6 @@ source_set("redirection_header") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("sql_unittests_run") { - testonly = true - deps = [ - ":sql_unittests", - ] -} - test("sql_unittests") { sources = [ "connection_unittest.cc", diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 52f9a34..8c9788c 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -610,15 +610,6 @@ static_library("test_support_sync_api") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("sync_unit_tests_run") { - testonly = true - deps = [ - ":sync_unit_tests", - ] -} - # GYP version: sync/sync_tests.gypi:sync_unit_tests test("sync_unit_tests") { sources = [ diff --git a/testing/test.gni b/testing/test.gni index acd1e1a..1c2a927 100644 --- a/testing/test.gni +++ b/testing/test.gni @@ -186,6 +186,8 @@ template("test") { ] } } else { + main_target_name = target_name + executable(target_name) { forward_variables_from(invoker, "*") @@ -203,5 +205,14 @@ template("test") { "//build/win:default_exe_manifest", ] } + + # TODO(GYP): Delete this after we've converted everything to GN. + # The _run targets exist only for compatibility with GYP. + group("${target_name}_run") { + testonly = true + deps = [ + ":$main_target_name", + ] + } } } diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn index fd02572..3ceedf8 100644 --- a/third_party/WebKit/Source/platform/BUILD.gn +++ b/third_party/WebKit/Source/platform/BUILD.gn @@ -359,15 +359,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("blink_heap_unittests_run") { - testonly = true - deps = [ - ":blink_heap_unittests", - ] -} - # GYP: blink_heap_unittests test("blink_heap_unittests") { visibility = [] # Allow re-assignment of list. @@ -402,15 +393,6 @@ test("blink_heap_unittests") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("blink_platform_unittests_run") { - testonly = true - deps = [ - ":blink_platform_unittests", - ] -} - test("blink_platform_unittests") { visibility = [] # Allow re-assignment of list. visibility = [ "*" ] diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn index 0113419..f152145 100644 --- a/third_party/WebKit/Source/web/BUILD.gn +++ b/third_party/WebKit/Source/web/BUILD.gn @@ -97,15 +97,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("webkit_unit_tests_run") { - testonly = true - deps = [ - ":webkit_unit_tests", - ] -} - group("webkit_unit_tests_data") { data = [ "tests/data/", diff --git a/third_party/WebKit/Source/wtf/BUILD.gn b/third_party/WebKit/Source/wtf/BUILD.gn index 09d9eff..b7cce42 100644 --- a/third_party/WebKit/Source/wtf/BUILD.gn +++ b/third_party/WebKit/Source/wtf/BUILD.gn @@ -95,15 +95,6 @@ component("wtf") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("wtf_unittests_run") { - testonly = true - deps = [ - ":wtf_unittests", - ] -} - test("wtf_unittests") { visibility = [] # Allow re-assignment of list. visibility = [ "*" ] diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn index 083c6ff..16ec2c6 100644 --- a/third_party/cacheinvalidation/BUILD.gn +++ b/third_party/cacheinvalidation/BUILD.gn @@ -90,15 +90,6 @@ static_library("cacheinvalidation") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("cacheinvalidation_unittests_run") { - testonly = true - deps = [ - ":cacheinvalidation_unittests", - ] -} - test("cacheinvalidation_unittests") { sources = [ "src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc", diff --git a/tools/battor_agent/BUILD.gn b/tools/battor_agent/BUILD.gn index 12fb7d5..1a057f3 100644 --- a/tools/battor_agent/BUILD.gn +++ b/tools/battor_agent/BUILD.gn @@ -59,12 +59,3 @@ test("battor_agent_unittests") { "//testing/gtest", ] } - -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("battor_agent_unittests_run") { - testonly = true - deps = [ - ":battor_agent_unittests", - ] -} diff --git a/tools/gn/BUILD.gn b/tools/gn/BUILD.gn index e643f97..eb60e08 100644 --- a/tools/gn/BUILD.gn +++ b/tools/gn/BUILD.gn @@ -241,15 +241,6 @@ executable("gn") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gn_unittests_run") { - testonly = true - deps = [ - ":gn_unittests", - ] -} - test("gn_unittests") { sources = [ "action_target_generator_unittest.cc", diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn index 59f7eee..64c008d 100644 --- a/ui/accessibility/BUILD.gn +++ b/ui/accessibility/BUILD.gn @@ -126,15 +126,6 @@ source_set("test_support") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("accessibility_unittests_run") { - testonly = true - deps = [ - ":accessibility_unittests", - ] -} - test("accessibility_unittests") { sources = [ "ax_generated_tree_unittest.cc", diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn index e66b9c3..b90ba0e 100644 --- a/ui/app_list/BUILD.gn +++ b/ui/app_list/BUILD.gn @@ -267,15 +267,6 @@ if (is_linux && !is_chromeos) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("app_list_unittests_run") { - testonly = true - deps = [ - ":app_list_unittests", - ] -} - test("app_list_unittests") { sources = [ "app_list_item_list_unittest.cc", diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn index f5a398a..361b94e 100644 --- a/ui/aura/BUILD.gn +++ b/ui/aura/BUILD.gn @@ -279,15 +279,6 @@ executable("bench") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("aura_unittests_run") { - testonly = true - deps = [ - ":aura_unittests", - ] -} - test("aura_unittests") { sources = [ "gestures/gesture_recognizer_unittest.cc", diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 799b57c..1ec9371 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -661,16 +661,6 @@ if (is_android) { } } -# -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("ui_base_unittests_run") { - testonly = true - deps = [ - ":ui_base_unittests", - ] -} - # GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests test("ui_base_unittests") { sources = [ diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn index c2c3c22..db0b0ce 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -160,15 +160,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("compositor_unittests_run") { - testonly = true - deps = [ - ":compositor_unittests", - ] -} - test("compositor_unittests") { sources = [ "callback_layer_animation_observer_unittest.cc", diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn index 6c6c181..b8c7603 100644 --- a/ui/display/BUILD.gn +++ b/ui/display/BUILD.gn @@ -130,15 +130,6 @@ if (is_chromeos) { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("display_unittests_run") { - testonly = true - deps = [ - ":display_unittests", - ] -} - # This test covers the ChromeOS "display" target as well as the cross-platform # //display/util target. test("display_unittests") { diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn index a875264..c2026f7 100644 --- a/ui/events/BUILD.gn +++ b/ui/events/BUILD.gn @@ -333,15 +333,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("events_unittests_run") { - testonly = true - deps = [ - ":events_unittests", - ] -} - test("events_unittests") { sources = [ "android/scroller_unittest.cc", diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index 24be9d5..4d181b6 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -627,15 +627,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gfx_unittests_run") { - testonly = true - deps = [ - ":gfx_unittests", - ] -} - test("gfx_unittests") { sources = [ "font_render_params_linux_unittest.cc", diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn index c0a8627..9f5b7bd 100644 --- a/ui/gl/BUILD.gn +++ b/ui/gl/BUILD.gn @@ -328,15 +328,6 @@ source_set("test_support") { } } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("gl_unittests_run") { - testonly = true - deps = [ - ":gl_unittests", - ] -} - test("gl_unittests") { sources = [ "gl_api_unittest.cc", diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn index 4d69e18..cc27387 100644 --- a/ui/touch_selection/BUILD.gn +++ b/ui/touch_selection/BUILD.gn @@ -68,15 +68,6 @@ static_library("test_support") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("ui_touch_selection_unittests_run") { - testonly = true - deps = [ - ":ui_touch_selection_unittests", - ] -} - test("ui_touch_selection_unittests") { sources = [ "longpress_drag_selector_unittest.cc", diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn index 22fb3c1..3be6e2d 100644 --- a/ui/wm/BUILD.gn +++ b/ui/wm/BUILD.gn @@ -107,15 +107,6 @@ static_library("test_support") { ] } -# TODO(GYP): Delete this after we've converted everything to GN. -# The _run targets exist only for compatibility w/ GYP. -group("wm_unittests_run") { - testonly = true - deps = [ - ":wm_unittests", - ] -} - test("wm_unittests") { sources = [ "core/capture_controller_unittest.cc", diff --git a/url/BUILD.gn b/url/BUILD.gn index d403efb..6924784 100644 --- a/url/BUILD.gn +++ b/url/BUILD.gn @@ -115,15 +115,6 @@ if (is_android) { # TODO(dpranke): crbug.com/360936. Get this to build and run on Android. if (!is_android) { - # TODO(GYP): Delete this after we've converted everything to GN. - # The _run targets exist only for compatibility w/ GYP. - group("url_unittests_run") { - testonly = true - deps = [ - ":url_unittests", - ] - } - test("url_unittests") { sources = [ "gurl_unittest.cc", |