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 /crypto | |
| 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 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 5 | ||||
| -rw-r--r-- | crypto/run_all_unittests.cc | 17 |
2 files changed, 1 insertions, 21 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index e2ac853..2f38aee 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -243,10 +243,6 @@ 'target_name': 'crypto_unittests', 'type': 'executable', 'sources': [ - # Infrastructure files. - 'run_all_unittests.cc', - - # Tests. 'curve25519_unittest.cc', 'ec_private_key_unittest.cc', 'ec_signature_creator_unittest.cc', @@ -270,6 +266,7 @@ 'dependencies': [ 'crypto', '../base/base.gyp:base', + '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', diff --git a/crypto/run_all_unittests.cc b/crypto/run_all_unittests.cc deleted file mode 100644 index 0728a98..0000000 --- a/crypto/run_all_unittests.cc +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2012 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" -#include "crypto/nss_util.h" - -int main(int argc, char** argv) { -#if defined(USE_NSS) - // This is most likely not needed, but it basically replaces a similar call - // that was performed on test_support_base. - // TODO(rvargas) Bug 79359: remove this. - crypto::EnsureNSSInit(); -#endif // defined(USE_NSS) - - return base::TestSuite(argc, argv).Run(); -} |