Run dbus_unittests serially.

Also fix a bug that prevented that from actually working.

BUG=236893
R=stevenjb@chromium.org

Review URL: https://codereview.chromium.org/108563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239269 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 31 insertions, 1 deletions

diff --git a/dbus/dbus.gyp b/dbus/dbus.gyp
index 7225845..4d90497 100644
--- a/dbus/dbus.gyp
+++ b/dbus/dbus.gyp
@@ -86,7 +86,6 @@
       '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',
@@ -105,6 +104,7 @@
         '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
new file mode 100644
index 0000000..e90849c
--- /dev/null
+++ b/dbus/run_all_unittests.cc
@@ -0,0 +1,30 @@
+// 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/at_exit.h"
+#include "base/bind.h"
+#include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/test_suite.h"
+
+namespace {
+
+class NoAtExitBaseTestSuite : public base::TestSuite {
+ public:
+  NoAtExitBaseTestSuite(int argc, char** argv)
+      : base::TestSuite(argc, argv, false) {
+  }
+};
+
+int RunTestSuite(int argc, char** argv) {
+  return NoAtExitBaseTestSuite(argc, argv).Run();
+}
+
+}  // namespace
+
+int main(int argc, char** argv) {
+  base::AtExitManager at_exit;
+  return base::LaunchUnitTestsSerially(argc,
+                                       argv,
+                                       base::Bind(&RunTestSuite, argc, argv));
+}