Skip to content

Commit

Permalink
Merge pull request #2160 from dscho/skip-t9822-on-apfs-gfw
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dscho committed Apr 16, 2019
2 parents d3e1cc2 + 3a10c78 commit 231c608
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config.mak.uname
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ ifeq ($(uname_S),Darwin)
HAVE_BSD_SYSCTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
Expand Down
7 changes: 7 additions & 0 deletions t/t9822-git-p4-path-encoding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths'
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"

ISO8859="$(printf "$ISO8859_ESCAPED")" &&
echo content123 >"$ISO8859" &&
rm "$ISO8859" || {
skip_all="fs does not accept ISO-8859-1 filenames"
test_done
}

test_expect_success 'start p4d' '
start_p4d
'
Expand Down

0 comments on commit 231c608

Please sign in to comment.