summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'dbus')
-rw-r--r--dbus/BUILD.gn2
-rw-r--r--dbus/dbus.gyp2
-rw-r--r--dbus/run_all_unittests.cc14
3 files changed, 2 insertions, 16 deletions
diff --git a/dbus/BUILD.gn b/dbus/BUILD.gn
index ee154a8..dbeee0c 100644
--- a/dbus/BUILD.gn
+++ b/dbus/BUILD.gn
@@ -90,7 +90,6 @@ test("dbus_unittests") {
"object_manager_unittest.cc",
"object_proxy_unittest.cc",
"property_unittest.cc",
- "run_all_unittests.cc",
"signal_sender_verification_unittest.cc",
"string_util_unittest.cc",
"test_service.cc",
@@ -103,6 +102,7 @@ test("dbus_unittests") {
":dbus",
":test_proto",
":test_support",
+ "//base/test:run_all_unittests",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
diff --git a/dbus/dbus.gyp b/dbus/dbus.gyp
index daac2e2..264383e 100644
--- a/dbus/dbus.gyp
+++ b/dbus/dbus.gyp
@@ -89,6 +89,7 @@
'target_name': 'dbus_unittests',
'type': 'executable',
'dependencies': [
+ '../base/base.gyp:run_all_unittests',
'../base/base.gyp:test_support_base',
'../build/linux/system.gyp:dbus',
'../testing/gmock.gyp:gmock',
@@ -107,7 +108,6 @@
'object_manager_unittest.cc',
'object_proxy_unittest.cc',
'property_unittest.cc',
- 'run_all_unittests.cc',
'signal_sender_verification_unittest.cc',
'string_util_unittest.cc',
'test_service.cc',
diff --git a/dbus/run_all_unittests.cc b/dbus/run_all_unittests.cc
deleted file mode 100644
index a758d54..0000000
--- a/dbus/run_all_unittests.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 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/bind.h"
-#include "base/test/launcher/unit_test_launcher.h"
-#include "base/test/test_suite.h"
-
-int main(int argc, char** argv) {
- base::TestSuite test_suite(argc, argv);
- return base::LaunchUnitTestsSerially(
- argc, argv,
- base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
-}