Skip to content

Commit 2d7195b

Browse files
committed
Merge pull request #2160 from dscho/skip-t9822-on-apfs-gfw
Prepare our git-p4 tests for running on APFS; This is necessary to fix the CI builds since Azure Pipelines' macOS agents were upgraded to Mojave.
2 parents b811955 + 4c990c0 commit 2d7195b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

config.mak.uname

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ ifeq ($(uname_S),Darwin)
133133
HAVE_BSD_SYSCTL = YesPlease
134134
FREAD_READS_DIRECTORIES = UnfortunatelyYes
135135
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
136+
BASIC_CFLAGS += -I/usr/local/include
137+
BASIC_LDFLAGS += -L/usr/local/lib
136138
endif
137139
ifeq ($(uname_S),SunOS)
138140
NEEDS_SOCKET = YesPlease

t/t9822-git-p4-path-encoding.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths'
77
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
88
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
99

10+
ISO8859="$(printf "$ISO8859_ESCAPED")" &&
11+
echo content123 >"$ISO8859" &&
12+
rm "$ISO8859" || {
13+
skip_all="fs does not accept ISO-8859-1 filenames"
14+
test_done
15+
}
16+
1017
test_expect_success 'start p4d' '
1118
start_p4d
1219
'

0 commit comments

Comments
 (0)