From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Wed, 30 Jan 2019 16:15:59 +0000 (+0000)
Subject: [utils] Fix update scripts output when run on python3.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b739c0c2b781a0b63297e9204d8de4e266d1b5ca;p=llvm

[utils] Fix update scripts output when run on python3.

This fixes a "bytes-like object is required, not 'str'" python3 error I hit on update_llc_test_checks.py (but present on the other scripts as well) by matching what update_mca_test_checks.py already does, plus I've added an explicit 'utf-8' encoding.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@352633 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/update_analyze_test_checks.py b/utils/update_analyze_test_checks.py
index 64e64e090af..4d1d912aba8 100755
--- a/utils/update_analyze_test_checks.py
+++ b/utils/update_analyze_test_checks.py
@@ -186,7 +186,7 @@ def main():
       print('Writing %d lines to %s...' % (len(output_lines), test), file=sys.stderr)
 
     with open(test, 'wb') as f:
-      f.writelines([l + '\n' for l in output_lines])
+      f.writelines(['{}\n'.format(l).encode('utf-8') for l in output_lines])
 
 
 if __name__ == '__main__':
diff --git a/utils/update_llc_test_checks.py b/utils/update_llc_test_checks.py
index 960fee232dc..5d2aac2509e 100755
--- a/utils/update_llc_test_checks.py
+++ b/utils/update_llc_test_checks.py
@@ -172,7 +172,7 @@ def main():
       print('Writing %d lines to %s...' % (len(output_lines), test), file=sys.stderr)
 
     with open(test, 'wb') as f:
-      f.writelines([l + '\n' for l in output_lines])
+      f.writelines(['{}\n'.format(l).encode('utf-8') for l in output_lines])
 
 
 if __name__ == '__main__':
diff --git a/utils/update_mca_test_checks.py b/utils/update_mca_test_checks.py
index 06fd655ab79..87ac19b39ae 100755
--- a/utils/update_mca_test_checks.py
+++ b/utils/update_mca_test_checks.py
@@ -551,7 +551,7 @@ def _write_output(test_path, input_lines, prefix_list, block_infos,  # noqa
         'Writing {} lines to {}...\n\n'.format(len(output_lines), test_path))
 
   with open(test_path, 'wb') as f:
-    f.writelines(['{}\n'.format(l).encode() for l in output_lines])
+    f.writelines(['{}\n'.format(l).encode('utf-8') for l in output_lines])
 
 def main():
   args = _parse_args()
diff --git a/utils/update_test_checks.py b/utils/update_test_checks.py
index 6d0bf0479c0..b63a9174208 100755
--- a/utils/update_test_checks.py
+++ b/utils/update_test_checks.py
@@ -183,7 +183,7 @@ def main():
       print('Writing %d lines to %s...' % (len(output_lines), test), file=sys.stderr)
 
     with open(test, 'wb') as f:
-      f.writelines([l + '\n' for l in output_lines])
+      f.writelines(['{}\n'.format(l).encode('utf-8') for l in output_lines])
 
 
 if __name__ == '__main__':