Merge branch master into package-grpc-tools-doc

1 files changed, 5 insertions, 2 deletions

diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 7ec02b707e..5722a88182 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -688,6 +688,10 @@ def write_cmdlog_maybe(cmdlog, filename):
     if cmdlog:
         with open(filename, 'w') as logfile:
             logfile.write('#!/bin/bash\n')
+            logfile.write('# DO NOT MODIFY\n')
+            logfile.write(
+                '# This file is generated by run_interop_tests.py/create_testcases.sh\n'
+            )
             logfile.writelines("%s\n" % line for line in cmdlog)
         print('Command log written to file %s' % filename)
 
@@ -1378,8 +1382,7 @@ try:
                                 transport_security='tls')
                             jobs.append(tls_test_job)
                             if str(language) in [
-                                    'c++',
-                                    'go',
+                                    'go'
                             ]:  # Add more languages to the list to turn on tests.
                                 google_default_creds_test_job = cloud_to_prod_jobspec(
                                     language,