Bug 1223073 - Move ssl_prf_unittest.cc to pk11_gtest. r=ekr

--HG-- rename : external_tests/ssl_gtest/ssl_prf_unittest.cc => external_tests/pk11_gtest/pk11_prf_unittest.cc
sailfishos-mirror · Nov 17, 2015 · b052e0a · b052e0a
1 parent 6a339fa
commit b052e0a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/external_tests/pk11_gtest/manifest.mn b/external_tests/pk11_gtest/manifest.mn
@@ -8,6 +8,7 @@ MODULE = nss
 
 CPPSRCS = \
       pk11_pbkdf2_unittest.cc \
+      pk11_prf_unittest.cc \
       pk11_rsapss_unittest.cc \
       pk11_gtest.cc \
       $(NULL)

diff --git a/external_tests/ssl_gtest/ssl_prf_unittest.cc → ...nal_tests/pk11_gtest/pk11_prf_unittest.cc b/external_tests/ssl_gtest/ssl_prf_unittest.cc → ...nal_tests/pk11_gtest/pk11_prf_unittest.cc
@@ -8,13 +8,10 @@
 #include "pk11pub.h"
 #include <memory>
 
-#include "gtest_utils.h"
+#include "gtest/gtest.h"
 
 namespace nss_test {
 
-#define CONST_UINT8_TO_UCHAR(a) const_cast<unsigned char*>( \
-    static_cast<const unsigned char *>(a))
-
 const size_t kPmsSize = 48;
 const size_t kMasterSecretSize = 48;
 const size_t kPrfSeedSizeSha256 = 32;

diff --git a/external_tests/ssl_gtest/manifest.mn b/external_tests/ssl_gtest/manifest.mn
@@ -15,7 +15,6 @@ CPPSRCS = \
       ssl_agent_unittest.cc \
       ssl_loopback_unittest.cc \
       ssl_extension_unittest.cc \
-      ssl_prf_unittest.cc \
       ssl_skip_unittest.cc \
       ssl_gtest.cc \
       test_io.cc \