summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-01-17 09:31:05 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-18 09:20:24 +0100
commitd5912b2a475f6d947fc11c754504afcf3aaddf31 (patch)
tree5ca8b2dabe1d90279ee277958f59b71b94b8ae92
parentf504287e80e55442620343227a99000d84ad603a (diff)
Testlib/generate_expected_output.py: Fix encoding.
Do not apply additional encoding when reading process output. Fixes errors when encountering UTF-8: Traceback (most recent call last): File "./generate_expected_output.py", line 117, in <module> generateTestData(path) File "./generate_expected_output.py", line 106, in generateTestData out.write(data.decode('utf-8')) UnicodeEncodeError: 'ascii' codec can't encode character u'\xdc' in position 5485: ordinal not in range(128) Change-Id: Ib827787a59a18b4d3d0601645856517f43c01fc3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rwxr-xr-xtests/auto/testlib/selftests/generate_expected_output.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index 049bd4f448..1c09faf4db 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -105,7 +105,7 @@ def generateTestData(testname):
result = 'expected_' + testname + '.' + format
data = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).communicate()[0]
out = open(result, 'w')
- out.write(data.decode('utf-8'))
+ out.write(data)
out.close()
replaceInFile(result)