1 files changed, 9 insertions, 6 deletions
diff --git a/src/boringssl/gen_build_yaml.py b/src/boringssl/gen_build_yaml.py
index 27c0c776c0..221cbe7fd5 100755
--- a/src/boringssl/gen_build_yaml.py
+++ b/src/boringssl/gen_build_yaml.py
@@ -48,6 +48,7 @@ class Grpc(object):
   yaml = None
 
   def WriteFiles(self, files, asm_outputs):
+
     self.yaml = {
       '#': 'generated with tools/buildgen/gen_boring_ssl_build_yaml.py',
       'raw_boringssl_build_output_for_debugging': {
@@ -98,7 +99,7 @@ class Grpc(object):
                 'boringssl',
             ]
           }
-          for test in sorted(files['test'])
+          for test in list(sorted(set(files['ssl_test'] + files['crypto_test'])))
       ],
       'targets': [
           {
@@ -107,7 +108,7 @@ class Grpc(object):
             'run': False,
             'secure': 'no',
             'language': 'c++',
-            'src': [],
+            'src': ["third_party/boringssl/crypto/test/gtest_main.cc"],
             'vs_proj_dir': 'test/boringssl',
             'boringssl': True,
             'defaults': 'boringssl',
@@ -117,23 +118,25 @@ class Grpc(object):
                 'boringssl',
             ]
           }
-          for test in sorted(files['test'])
+          for test in list(sorted(set(files['ssl_test'] + files['crypto_test'])))
       ],
       'tests': [
           {
-            'name': 'boringssl_%s' % os.path.basename(test[0]),
-            'args': [map_testarg(arg) for arg in test[1:]],
+            'name': 'boringssl_%s' % os.path.splitext(os.path.basename(test))[0],
+            'args': [],
             'exclude_configs': ['asan', 'ubsan'],
             'ci_platforms': ['linux', 'mac', 'posix', 'windows'],
             'platforms': ['linux', 'mac', 'posix', 'windows'],
             'flaky': False,
+            'gtest': True,
             'language': 'c++',
             'boringssl': True,
             'defaults': 'boringssl',
             'cpu_cost': 1.0
           }
-          for test in files['tests']
+          for test in list(sorted(set(files['ssl_test'] + files['crypto_test'])))
       ]
+
     }