diff options
| author | Martin Thomson <mt@lowentropy.net> | 2019-02-04 15:37:04 +1100 |
|---|---|---|
| committer | Martin Thomson <mt@lowentropy.net> | 2019-02-04 15:37:04 +1100 |
| commit | b21edc1a2d0efa4b8a9c5c26875b06e08a1440ce (patch) | |
| tree | 5a538c4918cd710297a532c2cb9c1906534c337e /gtests/util_gtest | |
| parent | e9f7b76ffd702dd82afc09705de0ffa04f219e3b (diff) | |
| download | nss-hg-b21edc1a2d0efa4b8a9c5c26875b06e08a1440ce.tar.gz | |
Bug 1524902 - Reduce dependencies for util_gtests, r=jcj
Summary: util_gtests shouldn't need to link so much of NSS.
Reviewers: jcj
Tags: #secure-revision
Bug #: 1524902
Differential Revision: https://phabricator.services.mozilla.com/D18519
Diffstat (limited to 'gtests/util_gtest')
| -rw-r--r-- | gtests/util_gtest/manifest.mn | 31 | ||||
| -rw-r--r-- | gtests/util_gtest/util_gtest.gyp | 18 | ||||
| -rw-r--r-- | gtests/util_gtest/util_gtests.cc | 13 |
3 files changed, 33 insertions, 29 deletions
diff --git a/gtests/util_gtest/manifest.mn b/gtests/util_gtest/manifest.mn index a90e8431e..c09146c83 100644 --- a/gtests/util_gtest/manifest.mn +++ b/gtests/util_gtest/manifest.mn @@ -3,29 +3,30 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. CORE_DEPTH = ../.. -DEPTH = ../.. +DEPTH = ../.. MODULE = nss CPPSRCS = \ - util_utf8_unittest.cc \ - util_b64_unittest.cc \ - util_pkcs11uri_unittest.cc \ - util_aligned_malloc_unittest.cc \ - util_memcmpzero_unittest.cc \ - $(NULL) + util_aligned_malloc_unittest.cc \ + util_b64_unittest.cc \ + util_gtests.cc \ + util_memcmpzero_unittest.cc \ + util_pkcs11uri_unittest.cc \ + util_utf8_unittest.cc \ + $(NULL) INCLUDES += \ - -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ - -I$(CORE_DEPTH)/gtests/common \ - -I$(CORE_DEPTH)/cpputil \ - $(NULL) + -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common \ + -I$(CORE_DEPTH)/cpputil \ + $(NULL) REQUIRES = nspr gtest PROGRAM = util_gtest EXTRA_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)gtestutil.$(LIB_SUFFIX) \ - $(NULL) + $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)gtestutil.$(LIB_SUFFIX) \ + $(NULL) diff --git a/gtests/util_gtest/util_gtest.gyp b/gtests/util_gtest/util_gtest.gyp index 1c54329b2..ab803b761 100644 --- a/gtests/util_gtest/util_gtest.gyp +++ b/gtests/util_gtest/util_gtest.gyp @@ -11,27 +11,17 @@ 'target_name': 'util_gtest', 'type': 'executable', 'sources': [ - 'util_utf8_unittest.cc', - 'util_b64_unittest.cc', - 'util_pkcs11uri_unittest.cc', 'util_aligned_malloc_unittest.cc', + 'util_b64_unittest.cc', + 'util_gtests.cc', 'util_memcmpzero_unittest.cc', - '<(DEPTH)/gtests/common/gtests.cc', + 'util_pkcs11uri_unittest.cc', + 'util_utf8_unittest.cc', ], 'dependencies': [ '<(DEPTH)/exports.gyp:nss_exports', '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', '<(DEPTH)/lib/util/util.gyp:nssutil', - '<(DEPTH)/lib/nss/nss.gyp:nss_static', - '<(DEPTH)/lib/pk11wrap/pk11wrap.gyp:pk11wrap_static', - '<(DEPTH)/lib/cryptohi/cryptohi.gyp:cryptohi', - '<(DEPTH)/lib/certhigh/certhigh.gyp:certhi', - '<(DEPTH)/lib/certdb/certdb.gyp:certdb', - '<(DEPTH)/lib/base/base.gyp:nssb', - '<(DEPTH)/lib/dev/dev.gyp:nssdev', - '<(DEPTH)/lib/pki/pki.gyp:nsspki', - '<(DEPTH)/lib/ssl/ssl.gyp:ssl', - '<(DEPTH)/lib/libpkix/libpkix.gyp:libpkix', ], 'conditions': [ [ 'OS=="win"', { diff --git a/gtests/util_gtest/util_gtests.cc b/gtests/util_gtest/util_gtests.cc new file mode 100644 index 000000000..94e4bc3f3 --- /dev/null +++ b/gtests/util_gtest/util_gtests.cc @@ -0,0 +1,13 @@ +#include "nspr.h" +#include "nss.h" +#include "ssl.h" + +#include <cstdlib> + +#define GTEST_HAS_RTTI 0 +#include "gtest/gtest.h" + +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} |