summaryrefslogtreecommitdiff
path: root/external_tests/der_gtest
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2016-05-03 15:13:36 +0200
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2016-05-03 15:13:36 +0200
commitf64dfd51ce4625c1a8465d3dcbd53671da2bc44e (patch)
tree25ca57b21a44a86c7a5b28542d56f868eab76109 /external_tests/der_gtest
parentc0392078bd28ebf0c955f4826a6dcee5964494c5 (diff)
downloadnss-hg-f64dfd51ce4625c1a8465d3dcbd53671da2bc44e.tar.gz
Bug 1242565 - refactor gtests, r=mt
Diffstat (limited to 'external_tests/der_gtest')
-rw-r--r--external_tests/der_gtest/der_gtest.cc21
-rw-r--r--external_tests/der_gtest/manifest.mn2
2 files changed, 1 insertions, 22 deletions
diff --git a/external_tests/der_gtest/der_gtest.cc b/external_tests/der_gtest/der_gtest.cc
deleted file mode 100644
index 1bbfabb1f..000000000
--- a/external_tests/der_gtest/der_gtest.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-#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) {
- // Start the tests
- ::testing::InitGoogleTest(&argc, argv);
-
- NSS_NoDB_Init(nullptr);
- NSS_SetDomesticPolicy();
- int rv = RUN_ALL_TESTS();
-
- NSS_Shutdown();
-
- return rv;
-}
diff --git a/external_tests/der_gtest/manifest.mn b/external_tests/der_gtest/manifest.mn
index 623f6199c..a7ff3f161 100644
--- a/external_tests/der_gtest/manifest.mn
+++ b/external_tests/der_gtest/manifest.mn
@@ -8,7 +8,7 @@ MODULE = nss
CPPSRCS = \
der_getint_unittest.cc \
- der_gtest.cc \
+ ../common/gtests.cc \
$(NULL)
INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \