1 files changed, 6 insertions, 46 deletions
diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc
index 3f765bf61..52bac99 100644
--- a/third_party/boringssl/boringssl_unittest.cc
+++ b/third_party/boringssl/boringssl_unittest.cc
@@ -157,6 +157,10 @@ TEST(BoringSSL, ByteString) {
   TestSimple("bytestring_test");
 }
 
+TEST(BoringSSL, ConstantTime) {
+  TestSimple("constant_time_test");
+}
+
 TEST(BoringSSL, Cipher) {
   base::FilePath data_file;
   ASSERT_TRUE(CryptoCipherTestPath(&data_file));
@@ -168,14 +172,6 @@ TEST(BoringSSL, Cipher) {
   TestProcess("cipher_test", args);
 }
 
-TEST(BoringSSL, CMAC) {
-  TestSimple("cmac_test");
-}
-
-TEST(BoringSSL, ConstantTime) {
-  TestSimple("constant_time_test");
-}
-
 TEST(BoringSSL, DH) {
   TestSimple("dh_test");
 }
@@ -205,16 +201,7 @@ TEST(BoringSSL, GCM) {
 }
 
 TEST(BoringSSL, HMAC) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("hmac_test", args);
+  TestSimple("hmac_test");
 }
 
 TEST(BoringSSL, LH) {
@@ -238,34 +225,7 @@ TEST(BoringSSL, ExampleMul) {
 }
 
 TEST(BoringSSL, EVP) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("evp"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("evp_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("evp_test", args);
-}
-
-// evp_test is also run on hmac_test's input.
-TEST(BoringSSL, EVPHMAC) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("evp_test", args);
-}
-
-TEST(BoringSSL, EVPExtra) {
-  TestSimple("evp_extra_test");
+  TestSimple("evp_test");
 }
 
 TEST(BoringSSL, SSL) {