summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-05 18:20:36 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-05 18:20:36 +0000
commitd85fe1ef8bb6b25396391508c4996845fcd12921 (patch)
tree29a6029f02cb1ba81384c12792fd9e402d361c4f /jingle
parent97063c3e2f54db0b01cc612a590eeb7ac478f5a2 (diff)
downloadchromium_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 'jingle')
-rw-r--r--jingle/jingle.gyp2
-rw-r--r--jingle/run_all_unittests.cc9
2 files changed, 1 insertions, 10 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index ecfd30e..b2e9f76 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -182,7 +182,6 @@
'notifier/listener/send_ping_task_unittest.cc',
'notifier/listener/xml_element_util_unittest.cc',
'notifier/listener/xmpp_push_client_unittest.cc',
- 'run_all_unittests.cc',
],
'conditions': [
['OS=="android"', {
@@ -203,6 +202,7 @@
'notifier',
'notifier_test_util',
'../base/base.gyp:base',
+ '../base/base.gyp:run_all_unittests',
'../base/base.gyp:test_support_base',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
diff --git a/jingle/run_all_unittests.cc b/jingle/run_all_unittests.cc
deleted file mode 100644
index 7fd6ef2..0000000
--- a/jingle/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();
-}