diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 18:20:36 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 18:20:36 +0000 |
| commit | d85fe1ef8bb6b25396391508c4996845fcd12921 (patch) | |
| tree | 29a6029f02cb1ba81384c12792fd9e402d361c4f /device | |
| parent | 97063c3e2f54db0b01cc612a590eeb7ac478f5a2 (diff) | |
| download | chromium_src-d85fe1ef8bb6b25396391508c4996845fcd12921.zip chromium_src-d85fe1ef8bb6b25396391508c4996845fcd12921.tar.gz chromium_src-d85fe1ef8bb6b25396391508c4996845fcd12921.tar.bz2 | |
Convert most run_all_unittests.cc files to use new unit test launcher.
Note that the new code is still behind a runtime flag
(--brave-new-test-launcher), but compiling tests with support for it
will make further testing possible.
BUG=236893, 79359
R=akalin@chromium.org, enne@chromium.org, erikwright@chromium.org, joi@chromium.org, keybuk@chromium.org, sky@chromium.org, thestig@chromium.org, tommi@chromium.org, wtc@chromium.org, xhwang@chromium.org, yzshen@chromium.org
Review URL: https://codereview.chromium.org/23442019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/device_tests.gyp | 2 | ||||
| -rw-r--r-- | device/test/run_all_unittests.cc | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/device/device_tests.gyp b/device/device_tests.gyp index bdc387c..c9d29d44 100644 --- a/device/device_tests.gyp +++ b/device/device_tests.gyp @@ -11,6 +11,7 @@ 'target_name': 'device_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ + '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -28,7 +29,6 @@ 'bluetooth/bluetooth_service_record_win_unittest.cc', 'bluetooth/bluetooth_task_manager_win_unittest.cc', 'bluetooth/bluetooth_utils_unittest.cc', - 'test/run_all_unittests.cc', 'usb/usb_ids_unittest.cc', ], 'conditions': [ diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc deleted file mode 100644 index f4b4fc8..0000000 --- a/device/test/run_all_unittests.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2011 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. - -#include "base/test/test_suite.h" - -int main(int argc, char **argv) { - return base::TestSuite(argc, argv).Run(); -} |