diff --git a/BUILD.gn b/BUILD.gn index 103cf9ab6ce594..1cad2baa088633 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -638,17 +638,34 @@ group("mojo_apptests") { testonly = true deps = [] + data_deps = [] + data = [] if (is_win || is_linux) { - deps += [ - "//components/resource_provider:resource_provider_unittests", - "//mash:mash_unittests", - "//media/mojo/services:tests", - "//ui/views/mus:tests", + deps += [ "//services/shell/standalone" ] + data_deps = [ + "//media/mojo/services:media_apptests", + ] + if (is_linux) { + data_deps += [ "//tools/xdisplaycheck" ] + } + data += [ + "//mojo/tools/apptest_runner.py", + "//mojo/tools/data/apptests", + "//mojo/tools/mopy/", + "//testing/xvfb.py", + "//tools/swarming_client/utils/subprocess42.py", ] } } +group("mojo_apptests_run") { + testonly = true + deps = [ + ":mojo_apptests", + ] +} + group("gn_only") { testonly = true diff --git a/gin/BUILD.gn b/gin/BUILD.gn index ef741011c36845..c0adbc9907ae6a 100644 --- a/gin/BUILD.gn +++ b/gin/BUILD.gn @@ -156,6 +156,9 @@ source_set("gin_test") { "test/v8_test.cc", "test/v8_test.h", ] + data = [ + "test/expect.js", + ] public_deps = [ ":gin", @@ -195,7 +198,6 @@ test("gin_unittests") { data = [ "modules/module_registry_unittests.js", "shell/hello_world.js", - "test/expect.js", "test/file_unittests.js", "test/gtest_unittests.js", "../OWNERS", diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp index 75c85d9824a2a1..e925d7ba856c7d 100644 --- a/ipc/mojo/ipc_mojo.gyp +++ b/ipc/mojo/ipc_mojo.gyp @@ -103,4 +103,23 @@ ], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'ipc_mojo_unittests_run', + 'type': 'none', + 'dependencies': [ + 'ipc_mojo_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + 'ipc_mojo_unittests.isolate', + ], + }, + ], + }], + ], } diff --git a/ipc/mojo/ipc_mojo_unittests.isolate b/ipc/mojo/ipc_mojo_unittests.isolate new file mode 100644 index 00000000000000..9f272257180f7f --- /dev/null +++ b/ipc/mojo/ipc_mojo_unittests.isolate @@ -0,0 +1,23 @@ +# Copyright 2015 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. +{ + 'includes': [ + '../../mojo/mojo.isolate', + ], + 'conditions': [ + ['OS=="win" or OS=="mac" or OS=="linux"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/ipc_mojo_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + ], + 'files': [ + '../../testing/test_env.py', + ], + }, + }], + ], +} diff --git a/mojo/edk/js/test/BUILD.gn b/mojo/edk/js/test/BUILD.gn index 3da5bc8b38a7b8..c5a78c35056f98 100644 --- a/mojo/edk/js/test/BUILD.gn +++ b/mojo/edk/js/test/BUILD.gn @@ -16,9 +16,11 @@ test("js_unittests") { "//mojo/public/cpp/system", "//mojo/public/interfaces/bindings/tests:test_interfaces", "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental", + "//mojo/public/js:tests", ] sources = [ + "//mojo/edk/js/handle_unittest.cc", "run_js_tests.cc", ] } @@ -35,6 +37,7 @@ test("js_integration_tests") { "//mojo/edk/test:test_support", "//mojo/public/cpp/bindings", "//mojo/public/interfaces/bindings/tests:test_interfaces", + "//mojo/public/js:bindings", ] sources = [ diff --git a/mojo/edk/js/tests/BUILD.gn b/mojo/edk/js/tests/BUILD.gn index 5761bcb3c05b3b..b21cdbc40b8df9 100644 --- a/mojo/edk/js/tests/BUILD.gn +++ b/mojo/edk/js/tests/BUILD.gn @@ -23,6 +23,12 @@ source_set("js_to_cpp_tests") { "js_to_cpp_tests.cc", ] + data = [ + "connection_tests.js", + "js_to_cpp_tests.js", + "sample_service_tests.js", + ] + configs += [ "//v8:external_startup_data" ] } diff --git a/mojo/mojo.isolate b/mojo/mojo.isolate new file mode 100644 index 00000000000000..693e94a3dbb9c0 --- /dev/null +++ b/mojo/mojo.isolate @@ -0,0 +1,31 @@ +# 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. +{ + 'includes': [ + '../base/base.isolate', + ], + 'conditions': [ + ['OS=="win"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/mojo_public_test_support.dll', + ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so', + ], + }, + }], + ['OS=="mac"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/libmojo_public_test_support.dylib', + ], + }, + }], + ], +} diff --git a/mojo/mojo_common_unittests.isolate b/mojo/mojo_common_unittests.isolate index 8fe9d31f72884d..caeaf440af2383 100644 --- a/mojo/mojo_common_unittests.isolate +++ b/mojo/mojo_common_unittests.isolate @@ -3,7 +3,7 @@ # found in the LICENSE file. { 'includes': [ - '../base/base.isolate', + '../mojo/mojo.isolate', ], 'conditions': [ ['OS=="win" or OS=="mac" or OS=="linux"', { @@ -19,26 +19,5 @@ ], }, }], - ['OS=="win"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/mojo_public_test_support.dll', - ], - }, - }], - ['OS=="linux"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so', - ], - }, - }], - ['OS=="mac"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/libmojo_public_test_support.dylib', - ], - }, - }], ], } diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp index d4a65aaec473e0..4bed79a5693b2b 100644 --- a/mojo/mojo_edk_tests.gyp +++ b/mojo/mojo_edk_tests.gyp @@ -326,6 +326,45 @@ 'mojo_public_system_unittests.isolate', ], }, + { + 'target_name': 'mojo_js_unittests_run', + 'type': 'none', + 'dependencies': [ + 'mojo_js_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'mojo_js_unittests.isolate', + ], + }, + { + 'target_name': 'mojo_js_integration_tests_run', + 'type': 'none', + 'dependencies': [ + 'mojo_js_integration_tests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'mojo_js_integration_tests.isolate', + ], + }, + { + 'target_name': 'mojo_system_unittests_run', + 'type': 'none', + 'dependencies': [ + 'mojo_system_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'mojo_system_unittests.isolate', + ], + }, ], }], ], diff --git a/mojo/mojo_js_integration_tests.isolate b/mojo/mojo_js_integration_tests.isolate new file mode 100644 index 00000000000000..76d6f9c33d2f2f --- /dev/null +++ b/mojo/mojo_js_integration_tests.isolate @@ -0,0 +1,49 @@ +# 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. +{ + 'includes': [ + '../gin/v8.isolate', + '../mojo/mojo.isolate', + '../third_party/icu/icu.isolate', + ], + 'conditions': [ + ['OS=="win" or OS=="mac" or OS=="linux"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/mojo_js_integration_tests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + ], + 'files': [ + '../gin/test/expect.js', + '../mojo/edk/js/tests/', + '../mojo/public/js/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/mojo_js_integration_tests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/gen/mojo/common/common_custom_types.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/edk/js/tests/js_to_cpp.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/math_calculator.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/no_module.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/ping_service.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/rect.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/regression_tests.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_factory.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import2.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_service.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/scoping.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_constants.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_native_types.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_structs.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_sync_methods.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_unions.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.js', + ], + }, + }], + ], +} diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate index c6283884b532d0..7dae01ba23e8a6 100644 --- a/mojo/mojo_js_unittests.isolate +++ b/mojo/mojo_js_unittests.isolate @@ -3,6 +3,8 @@ # found in the LICENSE file. { 'includes': [ + '../gin/v8.isolate', + '../mojo/mojo.isolate', '../third_party/icu/icu.isolate', ], 'conditions': [ @@ -17,30 +19,26 @@ 'files': [ '../gin/test/expect.js', '../testing/test_env.py', - '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/', - 'bindings/js/', - 'public/js/bindings/', - ], - }, - }], - ['OS=="win"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/mojo_public_test_support.dll', - ], - }, - }], - ['OS=="linux"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so', - ], - }, - }], - ['OS=="mac"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/libmojo_public_test_support.dylib', + 'public/interfaces/bindings/tests/data/validation/', + 'public/js/', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/math_calculator.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/no_module.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/ping_service.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/rect.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/regression_tests.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_factory.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import2.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_service.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/scoping.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_constants.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_native_types.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_structs.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_sync_methods.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_unions.mojom.js', + '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.js', ], }, }], diff --git a/mojo/mojo_public_bindings_unittests.isolate b/mojo/mojo_public_bindings_unittests.isolate index 4c1ffaaa616f35..2b4436fc98991d 100644 --- a/mojo/mojo_public_bindings_unittests.isolate +++ b/mojo/mojo_public_bindings_unittests.isolate @@ -3,7 +3,7 @@ # found in the LICENSE file. { 'includes': [ - '../base/base.isolate', + '../mojo/mojo.isolate', ], 'conditions': [ ['OS=="win" or OS=="mac" or OS=="linux"', { @@ -19,26 +19,5 @@ ], }, }], - ['OS=="win"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/mojo_public_test_support.dll', - ], - }, - }], - ['OS=="linux"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so', - ], - }, - }], - ['OS=="mac"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/libmojo_public_test_support.dylib', - ], - }, - }], ], } diff --git a/mojo/mojo_public_system_unittests.isolate b/mojo/mojo_public_system_unittests.isolate index 73b8c0052fc7f4..87099f6024250d 100644 --- a/mojo/mojo_public_system_unittests.isolate +++ b/mojo/mojo_public_system_unittests.isolate @@ -3,7 +3,7 @@ # found in the LICENSE file. { 'includes': [ - '../base/base.isolate', + '../mojo/mojo.isolate', ], 'conditions': [ ['OS=="win" or OS=="mac" or OS=="linux"', { @@ -19,26 +19,5 @@ ], }, }], - ['OS=="win"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/mojo_public_test_support.dll', - ], - }, - }], - ['OS=="linux"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so', - ], - }, - }], - ['OS=="mac"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/libmojo_public_test_support.dylib', - ], - }, - }], ], } diff --git a/mojo/mojo_system_unittests.isolate b/mojo/mojo_system_unittests.isolate new file mode 100644 index 00000000000000..cfd6b48918ae16 --- /dev/null +++ b/mojo/mojo_system_unittests.isolate @@ -0,0 +1,23 @@ +# Copyright 2015 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. +{ + 'includes': [ + '../mojo/mojo.isolate', + ], + 'conditions': [ + ['OS=="win" or OS=="mac" or OS=="linux"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/mojo_system_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + ], + 'files': [ + '../testing/test_env.py', + ], + }, + }], + ], +} diff --git a/mojo/public/js/BUILD.gn b/mojo/public/js/BUILD.gn index 4b86e6eb9a562f..eda7e04d07ef67 100644 --- a/mojo/public/js/BUILD.gn +++ b/mojo/public/js/BUILD.gn @@ -8,3 +8,38 @@ source_set("js") { "constants.h", ] } + +group("bindings") { + data = [ + "bindings.js", + "buffer.js", + "codec.js", + "connection.js", + "connector.js", + "constants.cc", + "constants.h", + "core.js", + "router.js", + "support.js", + "threading.js", + "unicode.js", + "validator.js", + ] +} + +group("tests") { + testonly = true + + data = [ + "codec_unittests.js", + "core_unittests.js", + "struct_unittests.js", + "test/validation_test_input_parser.js", + "union_unittests.js", + "validation_unittests.js", + "//mojo/public/interfaces/bindings/tests/data/validation/", + ] + public_deps = [ + ":bindings", + ] +} diff --git a/mojo/public/mojo_application_manifest.gni b/mojo/public/mojo_application_manifest.gni index b66626b88bfa0b..61844173058200 100644 --- a/mojo/public/mojo_application_manifest.gni +++ b/mojo/public/mojo_application_manifest.gni @@ -107,11 +107,14 @@ template("mojo_application_manifest") { } } deps = [] + data_deps = [] if (defined(invoker.deps)) { deps += invoker.deps + data_deps += invoker.deps } if (defined(invoker.base_deps)) { deps += invoker.base_deps + data_deps += invoker.base_deps } } diff --git a/mojo/tools/apptest_runner.py b/mojo/tools/apptest_runner.py index 6494db73cb1f8d..7fa0aba27c8897 100755 --- a/mojo/tools/apptest_runner.py +++ b/mojo/tools/apptest_runner.py @@ -30,6 +30,8 @@ def main(): help='The number of times to repeat the set of tests.') parser.add_argument('--write-full-results-to', metavar='FILENAME', help='The path to write the JSON list of full results.') + parser.add_argument('--test-launcher-summary-output', metavar='FILENAME', + help='The path to write the JSON list of full results.') parser.add_argument('--test-list-file', metavar='FILENAME', type=file, default=APPTESTS, help='The file listing tests to run.') parser.add_argument('--apptest-filter', default='', @@ -112,6 +114,8 @@ def main(): if args.write_full_results_to: _WriteJSONResults(tests, failed, args.write_full_results_to) + if args.test_launcher_summary_output: + _WriteSwarmingJSONResults(tests, failed, args.test_launcher_summary_output) return 1 if failed else 0 @@ -160,5 +164,30 @@ def _AddPathToTrie(trie, path, value): _AddPathToTrie(trie[directory], rest, value) +def _WriteSwarmingJSONResults(tests, failed, write_full_results_to): + '''Writes the test results in the JSON test result format used by swarming.''' + results = { + 'all_tests': tests, + 'disabled_tests': [], + 'global_tags': [], + } + + test_results = [] + for test in sorted(tests): + value = [{ + 'status': 'FAILURE' if test in failed else 'SUCCESS', + 'output_snippet': '', + 'output_snippet_base64': '', + }] + test_results.append({test: value}) + results['per_iteration_data'] = test_results + + with open(write_full_results_to, 'w') as fp: + json.dump(results, fp, indent=2) + fp.write('\n') + + return results + + if __name__ == '__main__': sys.exit(main()) diff --git a/services/catalog/BUILD.gn b/services/catalog/BUILD.gn index 46f166da3b7ebf..f19696bcb61fd3 100644 --- a/services/catalog/BUILD.gn +++ b/services/catalog/BUILD.gn @@ -52,6 +52,9 @@ source_set("unittests") { sources = [ "entry_unittest.cc", ] + data = [ + "//services/catalog/data/", + ] deps = [ ":lib", "//base", diff --git a/services/shell/mojo_shell_unittests.isolate b/services/shell/mojo_shell_unittests.isolate new file mode 100644 index 00000000000000..bc4dc772c96779 --- /dev/null +++ b/services/shell/mojo_shell_unittests.isolate @@ -0,0 +1,23 @@ +# Copyright 2015 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. +{ + 'includes': [ + '../../mojo/mojo.isolate', + ], + 'conditions': [ + ['OS=="win" or OS=="mac" or OS=="linux"', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/mojo_shell_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + ], + 'files': [ + '../../testing/test_env.py', + ], + }, + }], + ], +} diff --git a/services/shell/shell.gyp b/services/shell/shell.gyp index 2ec9da5bc8ce21..f4c2a51ef5b1af 100644 --- a/services/shell/shell.gyp +++ b/services/shell/shell.gyp @@ -248,4 +248,23 @@ 'public/cpp/tests/interface_registry_unittest.cc', ], }], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'mojo_shell_unittests_run', + 'type': 'none', + 'dependencies': [ + 'mojo_shell_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + 'mojo_shell_unittests.isolate', + ], + }, + ], + }], + ], } diff --git a/services/shell/tests/connect/BUILD.gn b/services/shell/tests/connect/BUILD.gn index 50c0d07a64a41b..00bf94408e69c2 100644 --- a/services/shell/tests/connect/BUILD.gn +++ b/services/shell/tests/connect/BUILD.gn @@ -62,13 +62,15 @@ mojo_native_application("connect_test_package") { "connect_test_package.cc", ] deps = [ - ":connect_test_package_manifest", ":interfaces", "//base", "//mojo/common:common_base", "//services/shell/public/cpp:sources", "//services/shell/public/interfaces", ] + data_deps = [ + ":connect_test_package_manifest", + ] } mojo_application_manifest("connect_test_package_manifest") { @@ -90,13 +92,15 @@ mojo_native_application("connect_test_app") { "connect_test_app.cc", ] deps = [ - ":connect_test_app_manifest", ":interfaces", "//base", "//mojo/common:common_base", "//services/shell/public/cpp:sources", "//services/shell/public/interfaces", ] + data_deps = [ + ":connect_test_app_manifest", + ] } mojo_application_manifest("connect_test_app_manifest") { @@ -110,13 +114,15 @@ mojo_native_application("connect_test_class_app") { "connect_test_class_app.cc", ] deps = [ - ":connect_test_class_app_manifest", ":interfaces", "//base", "//mojo/common:common_base", "//services/shell/public/cpp:sources", "//services/shell/public/interfaces", ] + data_deps = [ + ":connect_test_class_app_manifest", + ] } mojo_application_manifest("connect_test_class_app_manifest") { @@ -130,11 +136,13 @@ mojo_native_application("connect_test_singleton_app") { "connect_test_singleton_app.cc", ] deps = [ - ":connect_test_singleton_app_manifest", "//base", "//mojo/common:common_base", "//services/shell/public/cpp:sources", ] + data_deps = [ + ":connect_test_singleton_app_manifest", + ] } mojo_application_manifest("connect_test_singleton_app_manifest") { diff --git a/services/shell/tests/lifecycle/BUILD.gn b/services/shell/tests/lifecycle/BUILD.gn index e44b7147b52e6d..3e002e70a7b5c3 100644 --- a/services/shell/tests/lifecycle/BUILD.gn +++ b/services/shell/tests/lifecycle/BUILD.gn @@ -74,11 +74,13 @@ mojo_native_application("lifecycle_unittest_package") { deps = [ ":app_client", ":interfaces", - ":lifecycle_unittest_package_manifest", "//base", "//services/shell/public/cpp:sources", "//services/shell/public/interfaces", ] + data_deps = [ + ":lifecycle_unittest_package_manifest", + ] } mojo_application_manifest("lifecycle_unittest_package_manifest") { diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index a89e2ded7d1d90..25c73992c9d1f0 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -590,6 +590,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -635,9 +638,15 @@ "test": "mojo_public_bindings_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -949,6 +958,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -994,9 +1006,15 @@ "test": "mojo_public_bindings_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1178,9 +1196,15 @@ "test": "midi_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_common_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_bindings_unittests" }, { @@ -1190,6 +1214,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1314,9 +1341,15 @@ "test": "midi_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_common_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_bindings_unittests" }, { @@ -1326,6 +1359,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1479,9 +1515,15 @@ "test": "midi_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_common_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_bindings_unittests" }, { @@ -1491,6 +1533,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1734,6 +1779,9 @@ "test": "midi_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_common_unittests" }, { @@ -1749,6 +1797,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -2436,6 +2487,9 @@ "test": "midi_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_common_unittests" }, { @@ -2451,6 +2505,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -2734,6 +2791,9 @@ "test": "midi_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_common_unittests" }, { @@ -2743,9 +2803,15 @@ "test": "mojo_public_bindings_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -7011,6 +7077,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -7542,9 +7611,15 @@ "test": "mojo_public_bindings_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -8507,6 +8582,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -8552,9 +8630,15 @@ "test": "mojo_public_bindings_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 1dfb2eb797e6ae..b429929f015da7 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -56,6 +56,9 @@ "test": "mojo_common_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_application_unittests" }, { @@ -71,12 +74,21 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_runner_host_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_surfaces_lib_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -772,6 +784,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -813,6 +828,12 @@ }, "test": "midi_unittests" }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "mojo_apptests" + }, { "swarming": { "can_use_on_swarming_builders": true @@ -820,12 +841,21 @@ "test": "mojo_common_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_js_integration_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_js_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_public_application_unittests" }, { @@ -841,18 +871,33 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_runner_host_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_shell_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_surfaces_lib_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_view_manager_lib_unittests" }, { @@ -1018,10 +1063,6 @@ { "name": "nacl_integration", "script": "nacl_integration.py" - }, - { - "name": "mojo_apptests", - "script": "mojo_apptests.py" } ] }, @@ -1216,6 +1257,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -1254,6 +1298,12 @@ }, "test": "midi_unittests" }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "mojo_apptests" + }, { "swarming": { "can_use_on_swarming_builders": true @@ -1273,6 +1323,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1420,10 +1473,6 @@ { "name": "nacl_integration", "script": "nacl_integration.py" - }, - { - "name": "mojo_apptests", - "script": "mojo_apptests.py" } ] }, diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index fa4afa673f8b18..2dbd81ab3812b2 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -276,6 +276,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -598,6 +601,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -920,6 +926,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1243,6 +1252,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 91bd8279a3ec3b..2dfbd4abcd6306 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -496,6 +496,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -547,6 +550,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -792,6 +798,9 @@ "test": "interactive_ui_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { @@ -843,6 +852,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1069,6 +1081,9 @@ "test": "gpu_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "ipc_mojo_unittests" }, { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 2ce1f86c28c69f..dbd1d7f3185973 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -265,6 +265,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -690,6 +693,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1127,6 +1133,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { @@ -1499,6 +1508,9 @@ "test": "mojo_public_system_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "mojo_system_unittests" }, { diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 23114897df9f90..edd32d97494b1b 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -332,7 +332,7 @@ }, "ipc_mojo_unittests": { "label": "//ipc/mojo:ipc_mojo_unittests", - "type": "unknown", + "type": "console_test_launcher", }, "ipc_tests": { "label": "//ipc:ipc_tests", @@ -372,6 +372,14 @@ "label": "//media/midi:midi_unittests", "type": "windowed_test_launcher", }, + "mojo_apptests": { + "label": ":mojo_apptests", + "type": "script", + "script": "//mojo/tools/apptest_runner.py", + "args": [ + '.', + ], + }, "mojo_common_unittests": { "label": "//mojo/common:mojo_common_unittests", "type": "console_test_launcher", @@ -385,8 +393,8 @@ "type": "console_test_launcher", }, "mojo_public_application_unittests": { - "label": "//mojo/edk/test:mojo_public_applicaiton_unittests", - "type": "unknown", + "label": "//services/shell/public/cpp/tests:mojo_public_application_unittests", + "type": "windowed_test_launcher", }, "mojo_public_bindings_unittests": { "label": "//mojo/edk/test:mojo_public_bindings_unittests", @@ -397,24 +405,24 @@ "type": "console_test_launcher", }, "mojo_runner_host_unittests": { - "label": "//mojo/runner/host:unittests", - "type": "unknown", + "label": "//services/shell/runner/host:mojo_runner_host_unittests", + "type": "console_test_launcher", }, "mojo_shell_unittests": { - "label": "//services/shell:mojo_shell_unittests", - "type": "unknown", + "label": "//services/shell/tests:mojo_shell_unittests", + "type": "console_test_launcher", }, "mojo_surfaces_lib_unittests": { "label": "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests", - "type": "unknown", + "type": "windowed_test_launcher", }, "mojo_system_unittests": { "label": "//mojo/edk/system:mojo_system_unittests", - "type": "unknown", + "type": "console_test_launcher", }, "mojo_view_manager_lib_unittests": { - "label": "//components/view_manager/public/cpp/tests:mojo_view_manager_lib_unittests", - "type": "unknown", + "label": "//components/mus/public/cpp/tests:mojo_view_manager_lib_unittests", + "type": "windowed_test_launcher", }, "message_center_unittests": { "label": "//ui/message_center:message_center_unittests", diff --git a/testing/test.gni b/testing/test.gni index 0a6b98674a8ae5..650940e69744d9 100644 --- a/testing/test.gni +++ b/testing/test.gni @@ -338,5 +338,14 @@ template("test") { ":${invoker.target_name}", ] } + + if (defined(invoker.output_name) && target_name != invoker.output_name) { + group("${invoker.output_name}_run") { + testonly = true + deps = [ + ":${invoker.target_name}", + ] + } + } } }