[v2,1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded

Commit Message

Johannes Schindelin via GitGitGadget April 14, 2019, 9:19 p.m. UTC

From: Johannes Schindelin <[e-mail]>

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

Signed-off-by: Johannes Schindelin <[e-mail]>
---
 t/t9822-git-p4-path-encoding.sh | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Johannes Schindelin April 15, 2019, 12:37 p.m. UTC | #1

Hi Junio,

On Sun, 14 Apr 2019, Johannes Schindelin via GitGitGadget wrote:

> From: Johannes Schindelin <[e-mail]>
>
> Most notably, it seems that macOS' APFS does not allow that.
>
> Signed-off-by: Johannes Schindelin <[e-mail]>

This is actually a quite important fix, really, as it makes *every* CI
build fail in the macOS part, meaning that I am swamped with false
positives until this is fixed.

It seems not to have made it into the js/macos-gettext-build branch,
though. Would you terribly mind picking it up, please?

Thanks,
Dscho

Junio C Hamano April 15, 2019, 12:53 p.m. UTC | #2

On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin
<[e-mail]> wrote:
>
> It seems not to have made it into the js/macos-gettext-build branch,
> though. Would you terribly mind picking it up, please?

I think they are separately queued, so that they can graduate in any order,
even if/when one of them turns out to need rerolling.

Johannes Schindelin April 17, 2019, 11:48 a.m. UTC | #3

Hi Junio,

On Mon, 15 Apr 2019, Junio C Hamano wrote:

> On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin
> <[e-mail]> wrote:
> >
> > It seems not to have made it into the js/macos-gettext-build branch,
> > though. Would you terribly mind picking it up, please?
>
> I think they are separately queued, so that they can graduate in any order,
> even if/when one of them turns out to need rerolling.

Okay.

Please note, though, that I had packaged them together because they *both*
need to advance to any branch in order to make it pass on Azure Pipelines
again. (And to be sure, they both fix real bugs in Git, they are not mere
workarounds necessary to make the CI builds "green" again.)

Ciao,
Dscho

Patch

diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
index c78477c19b..de0b46581d 100755
--- a/t/t9822-git-p4-path-encoding.sh
+++ b/t/t9822-git-p4-path-encoding.sh
@@ -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
 '