Skip to content

Prepare our git-p4 tests for running on APFS

Johannes Schindelin via GitGitGadget git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 3 repliesIn review
  2. v12 patches 2 repliesSuperseded

Changes in v2 from the cover letter

* Fix the tyop in the oneline of the first patch where it should talk about ISO-8859-1.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2t9822: skip tests if file names cannot be ISO-8859-1 encodedt/t9822-git-p4-path-encoding.sh+7 -03 replies
2/2macOS: make sure that gettext is foundconfig.mak.uname+2 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/2] Prepare our git-p4 tests for running on APFS

Yesterday, the macOS agents of Azure Pipelines were upgraded to Mojave, and since that does not support HFS+ anymore, everything will be upgraded to APFS.

As I just found yesterday, we have one test that fails on that filesystem (t9822, which is only run if Perforce's p4d is available).

The first patch adds a workaround, as I failed to find any way to finagle APFS into accepting that ISO-8859-1 encoded file name.

The second patch is a fix to make things compile on Mojave again, apparently Homebrew changed and the /usr/local/ directories need to be added to the compiler and linker flags explicitly. Maybe this is a gcc-8 only thing, as it seems to have affected only the osx-gcc job, not the osx-clang job.

Changes since v1:

* Fix the tyop in the oneline of the first patch where it should talk about ISO-8859-1.

Johannes Schindelin (2):
t9822: skip tests if file names cannot be ISO-8859-1 encoded
macOS: make sure that gettext is found

 config.mak.uname                | 2 ++
 t/t9822-git-p4-path-encoding.sh | 7 +++++++
 2 files changed, 9 insertions(+)

base-commit: e35b8cb8e212e3557efc565157ceb5cbaaf0d87f
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-179%2Fdscho%2Fskip-t9822-on-apfs-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-179/dscho/skip-t9822-on-apfs-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/179

Range-diff vs v1:

1: 52681aee0a ! 1: 6161c76702 t9822: skip tests if file names cannot be ISO-8895-1 encoded
@@ -1,6 +1,6 @@
Author: Johannes Schindelin <[email protected]>

- t9822: skip tests if file names cannot be ISO-8895-1 encoded
+ t9822: skip tests if file names cannot be ISO-8859-1 encoded

Most notably, it seems that macOS' APFS does not allow that.

2: f006524f78 = 2: 25be67b1b7 macOS: make sure that gettext is found

Signature · 1 line
gitgitgadget