diff options
Diffstat (limited to 'chromium/chromeos')
| -rw-r--r-- | chromium/chromeos/chromeos.gyp | 33 | ||||
| -rw-r--r-- | chromium/chromeos/chromeos_unittests.isolate | 25 |
2 files changed, 52 insertions, 6 deletions
diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp index b98e2605478..18548aba899 100644 --- a/chromium/chromeos/chromeos.gyp +++ b/chromium/chromeos/chromeos.gyp @@ -174,8 +174,6 @@ 'dbus/fake_image_burner_client.h', 'dbus/fake_introspectable_client.cc', 'dbus/fake_introspectable_client.h', - 'dbus/fake_leadership_daemon_manager_client.cc', - 'dbus/fake_leadership_daemon_manager_client.h', 'dbus/fake_lorgnette_manager_client.cc', 'dbus/fake_lorgnette_manager_client.h', 'dbus/fake_modem_messaging_client.cc', @@ -218,12 +216,8 @@ 'dbus/image_burner_client.h', 'dbus/introspectable_client.cc', 'dbus/introspectable_client.h', - 'dbus/leadership_daemon_manager_client.cc', - 'dbus/leadership_daemon_manager_client.h', 'dbus/lorgnette_manager_client.cc', 'dbus/lorgnette_manager_client.h', - 'dbus/metronome_client.cc', - 'dbus/metronome_client.h', 'dbus/modem_messaging_client.cc', 'dbus/modem_messaging_client.h', 'dbus/nfc_adapter_client.cc', @@ -288,6 +282,8 @@ 'dbus/volume_state.h', 'disks/disk_mount_manager.cc', 'disks/disk_mount_manager.h', + 'disks/suspend_unmount_manager.cc', + 'disks/suspend_unmount_manager.h', 'geolocation/geoposition.cc', 'geolocation/geoposition.h', 'geolocation/simple_geolocation_provider.cc', @@ -443,6 +439,8 @@ 'settings/timezone_settings.h', 'settings/timezone_settings_helper.cc', 'settings/timezone_settings_helper.h', + 'system/devicetype.cc', + 'system/devicetype.h', 'system/name_value_pairs_parser.cc', 'system/name_value_pairs_parser.h', 'system/statistics_provider.cc', @@ -491,6 +489,7 @@ 'dbus/shill_service_client_unittest.cc', 'dbus/shill_third_party_vpn_driver_client_unittest.cc', 'disks/disk_mount_manager_unittest.cc', + 'disks/suspend_unmount_manager_unittest.cc', 'geolocation/simple_geolocation_unittest.cc', 'login/auth/key_unittest.cc', 'login/login_state_unittest.cc', @@ -546,6 +545,7 @@ '../components/components.gyp:cloud_policy_proto', '../components/components.gyp:device_event_log_component', '../components/components.gyp:onc_component', + '../components/components.gyp:proxy_config', '../crypto/crypto.gyp:crypto', '../dbus/dbus.gyp:dbus', '../google_apis/google_apis.gyp:google_apis', @@ -570,6 +570,7 @@ 'type': 'static_library', 'dependencies': [ '../build/linux/system.gyp:dbus', + '../google_apis/google_apis.gyp:google_apis_test_support', '../testing/gmock.gyp:gmock', 'chromeos', 'chromeos_test_support_without_gmock', @@ -667,6 +668,7 @@ '../build/linux/system.gyp:dbus', '../build/linux/system.gyp:ssl', '../components/components.gyp:onc_component', + '../components/components.gyp:proxy_config', '../crypto/crypto.gyp:crypto', '../crypto/crypto.gyp:crypto_test_support', '../dbus/dbus.gyp:dbus_test_support', @@ -743,4 +745,23 @@ 'includes': ['../build/protoc.gypi'], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'chromeos_unittests_run', + 'type': 'none', + 'dependencies': [ + 'chromeos_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'chromeos_unittests.isolate', + ], + }, + ], + }], + ], } diff --git a/chromium/chromeos/chromeos_unittests.isolate b/chromium/chromeos/chromeos_unittests.isolate new file mode 100644 index 00000000000..11648bf7e43 --- /dev/null +++ b/chromium/chromeos/chromeos_unittests.isolate @@ -0,0 +1,25 @@ +# 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. +{ + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/chromeos_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../net/data/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/chromeos_unittests<(EXECUTABLE_SUFFIX)', + 'test/data/', + ], + }, + 'includes': [ + '../base/base.isolate', + ], +} |