Revert "[test] Use system locale for mri-utf8.test"

This reverts commit r374318 / b6f1d1fa0e3ee0e25f22414bf97c05276b934507.

llvm-svn: 374349
This commit is contained in:
Thomas Preud'homme 2019-10-10 13:39:12 +00:00
parent 2f06e6d163
commit 4a5e8f6278
2 changed files with 23 additions and 22 deletions

View File

@ -1,22 +0,0 @@
# Test non-ascii archive members
# XFAIL: system-darwin
RUN: rm -rf %t && mkdir -p %t/extracted
# Note: lit's Python will read this UTF-8 encoded mri-nonascii.txt file,
# decode it to unicode. The filename in the redirection below will then
# be encoded in the system's filename encoding (e.g. UTF-16 for
# Microsoft Windows).
RUN: echo "contents" > %t/£.txt
RUN: echo "CREATE %t/mri.ar" > %t/script.mri
RUN: echo "ADDMOD %t/£.txt" >> %t/script.mri
RUN: echo "SAVE" >> %t/script.mri
RUN: llvm-ar -M < %t/script.mri
RUN: cd %t/extracted && llvm-ar x %t/mri.ar
# Same as above.
RUN: FileCheck --strict-whitespace %s <£.txt
CHECK:{{^}}
CHECK-SAME:{{^}}contents{{$}}

View File

@ -0,0 +1,23 @@
# Test non-ascii archive members
# XFAIL: system-darwin
RUN: rm -rf %t && mkdir -p %t/extracted
RUN: echo "contents" > %t/£.txt
RUN: echo "CREATE %t/mri.ar" > %t/script.mri
RUN: echo "ADDMOD %t/£.txt" >> %t/script.mri
RUN: echo "SAVE" >> %t/script.mri
RUN: llvm-ar -M < %t/script.mri
RUN: cd %t/extracted && llvm-ar x %t/mri.ar
# This works around problems launching processess that
# include arguments with non-ascii characters.
# Python on Linux defaults to ASCII encoding unless the
# environment specifies otherwise, so it is explicitly set.
# The reliance the test has on this locale is not ideal,
# however alternate solutions have been difficult due to
# behaviour differences with python 2 vs python 3,
# and linux vs windows.
RUN: env LANG=en_US.UTF-8 %python -c "assert open(u'\U000000A3.txt', 'rb').read() == b'contents\n'"