Skip to content
Permalink
Browse files

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.
  • Loading branch information...
dscho committed Apr 16, 2019
2 parents d3e1cc2 + 3a10c78 commit 231c608cd3fa0ddeadb27c928fe5eba4a51716a9
Showing with 9 additions and 0 deletions.
  1. +2 −0 config.mak.uname
  2. +7 −0 t/t9822-git-p4-path-encoding.sh
@@ -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
@@ -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
'

0 comments on commit 231c608

Please sign in to comment.
You can’t perform that action at this time.