From db2eac565860346931cc7421b434633b4c213879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Thu, 30 Jan 2020 23:39:59 +0000 Subject: [PATCH] diff-filter: use utf8 encoding, not ascii --- src/test/regress/bin/diff | 2 +- src/test/regress/bin/diff-filter | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/bin/diff b/src/test/regress/bin/diff index 2fc9a2261..0bbbe92ae 100755 --- a/src/test/regress/bin/diff +++ b/src/test/regress/bin/diff @@ -32,7 +32,7 @@ then touch "$file1" # when adding a new test the expected file does not exist sed -Ef "$BASEDIR/normalize.sed" < "$file1" > "$file1.modified" sed -Ef "$BASEDIR/normalize.sed" < "$file2" > "$file2.modified" - "$DIFF" -w $args "$file1.modified" "$file2.modified" | diff-filter "$BASEDIR/normalize.sed" + "$DIFF" -w $args "$file1.modified" "$file2.modified" | LC_CTYPE=C.UTF-8 diff-filter "$BASEDIR/normalize.sed" exit ${PIPESTATUS[0]} else exec "$DIFF" -w $args "$file1" "$file2" diff --git a/src/test/regress/bin/diff-filter b/src/test/regress/bin/diff-filter index b91225645..a23088d0d 100755 --- a/src/test/regress/bin/diff-filter +++ b/src/test/regress/bin/diff-filter @@ -49,7 +49,7 @@ def main(): if line.startswith('+++ '): tab = line.rindex('\t') fname = line[4:tab] - file2 = FileScanner(open(fname.replace('.modified', '')), sed) + file2 = FileScanner(open(fname.replace('.modified', ''), encoding='utf8'), sed) stdout.write(line) elif line.startswith('@@ '): idx_start = line.index('+') + 1