Skip to content

Commit 0bab053

Browse files
author
Thomas Preud'homme
committed
[test] Use system locale for mri-utf8.test
Summary: llvm-ar's mri-utf8.test test relies on the en_US.UTF-8 locale to be installed for its last RUN line to work. If not installed, the unicode string gets encoded (interpreted) as ascii which fails since the most significant byte is non zero. This commit changes the test to only rely on the system being able to encode the pound sign in its default encoding (e.g. UTF-16 for Microsoft Windows) by always opening the file via input/output redirection. This avoids forcing a given locale to be present and supported. A Byte Order Mark is also added to help recognizing the encoding of the file and its endianness. Finally the XFAIL on system-darwin is removed since the test actually passes fine on Mac OS X and XFAIL was only added because it failed before. Reviewers: gbreynoo, MaskRay, rupprecht, JamesNagurne, jfb Subscribers: dexonsmith, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D68472
1 parent bf6744d commit 0bab053

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Test non-ascii archive members
2+
3+
RUN: rm -rf %t && mkdir -p %t/extracted
4+
5+
# Note: lit's Python will read this UTF-8 encoded mri-nonascii.txt file,
6+
# decode it to unicode. The filename in the redirection below will then
7+
# be encoded in the system's filename encoding (e.g. UTF-16 for
8+
# Microsoft Windows).
9+
RUN: echo "contents" > %t/£.txt
10+
11+
RUN: echo "CREATE %t/mri.ar" > %t/script.mri
12+
RUN: echo "ADDMOD %t/£.txt" >> %t/script.mri
13+
RUN: echo "SAVE" >> %t/script.mri
14+
15+
RUN: llvm-ar -M < %t/script.mri
16+
RUN: cd %t/extracted && llvm-ar x %t/mri.ar
17+
18+
# Same as above.
19+
RUN: FileCheck --strict-whitespace %s <£.txt
20+
CHECK:{{^}}
21+
CHECK-SAME:{{^}}contents{{$}}

llvm/test/tools/llvm-ar/mri-utf8.test

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)