Skip to content

Commit a713c67

Browse files
committed
Skip linker-output-non-utf8 test on Apple
This test fails on APFS filesystems with the following error: mkdir: /Users/ryan/Code/rust/build/x86_64-apple-darwin/test/run-make/linker-output-non-utf8.stage2-x86_64-apple-darwin/zzz�: Illegal byte sequence This is due to APFS now requiring that all paths are valid UTF-8. As APFS will be the default filesystem for all new Darwin-based systems the most straightforward fix is to skip this test on Darwin as well as Windows.
1 parent 74966b5 commit a713c67

File tree

1 file changed

+12
-8
lines changed
  • src/test/run-make/linker-output-non-utf8

1 file changed

+12
-8
lines changed

src/test/run-make/linker-output-non-utf8/Makefile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22

33
# Make sure we don't ICE if the linker prints a non-UTF-8 error message.
44

5-
ifdef IS_WINDOWS
6-
# ignore windows
5+
# Ignore Windows and Apple
76

8-
# This does not work in its current form on windows, possibly due to
9-
# gcc bugs or something about valid Windows paths. See issue #29151
10-
# for more information.
11-
all:
12-
13-
else
7+
# This does not work in its current form on Windows or Apple APFS due
8+
# to their filesystems requiring paths to be valid Unicode.
9+
ifndef IS_WINDOWS
10+
ifneq ($(shell uname),Darwin)
1411

1512
# The zzz it to allow humans to tab complete or glob this thing.
1613
bad_dir := $(TMPDIR)/zzz$$'\xff'
@@ -20,5 +17,12 @@ all:
2017
mkdir $(bad_dir)
2118
mv $(TMPDIR)/liblibrary.a $(bad_dir)
2219
LIBRARY_PATH=$(bad_dir) $(RUSTC) exec.rs 2>&1 | $(CGREP) this_symbol_not_defined
20+
else
21+
all:
22+
23+
endif
24+
25+
else
26+
all:
2327

2428
endif

0 commit comments

Comments
 (0)