{"thread":{"id":"50925","subject":"[PATCH 0/2] Prepare our git-p4 tests for running on APFS","startedAt":"2019-04-12T11:39:46Z","lastAt":"2019-04-17T11:48:28Z","messageCount":11,"participants":["Johannes Schindelin via GitGitGadget","Luke Diamand","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"373734","messageId":"pull.179.git.gitgitgadget@gmail.com","threadId":"50925","inReplyTo":null,"subject":"[PATCH 0/2] Prepare our git-p4 tests for running on APFS","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-04-12T11:39:42Z","receivedAt":"2019-04-12T11:39:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Yesterday, the macOS agents of Azure Pipelines were upgraded to Mojave, and\nsince that does not support HFS+ anymore, everything will be upgraded to\nAPFS.\n\nAs I just found yesterday, we have one test that fails on that filesystem\n(t9822, which is only run if Perforce's p4d is available).\n\nThe first patch adds a workaround, as I failed to find any way to finagle\nAPFS into accepting that ISO-8859-1 encoded file name.\n\nThe second patch is a fix to make things compile on Mojave again, apparently\nHomebrew changed and the /usr/local/ directories need to be added to the\ncompiler and linker flags explicitly. Maybe this is a gcc-8 only thing, as\nit seems to have affected only the osx-gcc job, not the osx-clang job.\n\nJohannes Schindelin (2):\n t9822: skip tests if file names cannot be ISO-8895-1 encoded\n macOS: make sure that gettext is found\n\n config.mak.uname | 2 ++\n t/t9822-git-p4-path-encoding.sh | 7 +++++++\n 2 files changed, 9 insertions(+)\n\n\nbase-commit: e35b8cb8e212e3557efc565157ceb5cbaaf0d87f\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-179%2Fdscho%2Fskip-t9822-on-apfs-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-179/dscho/skip-t9822-on-apfs-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/179\n-- \ngitgitgadget\n"},{"id":"373735","messageId":"f006524f78a881b4f4e06cb15b877f8a226a9843.1555069181.git.gitgitgadget@gmail.com","threadId":"50925","inReplyTo":"pull.179.git.gitgitgadget@gmail.com","subject":"[PATCH 2/2] macOS: make sure that gettext is found","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-04-12T11:39:44Z","receivedAt":"2019-04-12T11:39:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nDue to reasons (some XCode versions seem to include gettext, some\ndon't?), Homebrew does not expose the libraries and headers in\n/usr/local/ by default anymore.\n\nLet's help find them again.\n\nNote: for some reason, this is a change of behavior caused by the\nupgrade to Mojave, identified in our Azure Pipeline; it seems that\nHomebrew used to add the /usr/local/ directories to the include and link\nsearch path before, but now it no longer does.\n\nSigned-off-by: Johannes Schindelin \n---\n config.mak.uname | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 41e85fab1c..3605fead53 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -114,6 +114,8 @@ ifeq ($(uname_S),Darwin)\n \tHAVE_BSD_SYSCTL = YesPlease\n \tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n \tHAVE_NS_GET_EXECUTABLE_PATH = YesPlease\n+\tBASIC_CFLAGS += -I/usr/local/include\n+\tBASIC_LDFLAGS += -L/usr/local/lib\n endif\n ifeq ($(uname_S),SunOS)\n \tNEEDS_SOCKET = YesPlease\n-- \ngitgitgadget\n"},{"id":"373736","messageId":"52681aee0a9657691521baf13f792bcfb9eeb898.1555069181.git.gitgitgadget@gmail.com","threadId":"50925","inReplyTo":"pull.179.git.gitgitgadget@gmail.com","subject":"[PATCH 1/2] t9822: skip tests if file names cannot be ISO-8895-1 encoded","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-04-12T11:39:43Z","receivedAt":"2019-04-12T11:39:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nMost notably, it seems that macOS' APFS does not allow that.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9822-git-p4-path-encoding.sh | 7 +++++++\n 1 file changed, 7 insertions(+)\n\ndiff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh\nindex c78477c19b..de0b46581d 100755\n--- a/t/t9822-git-p4-path-encoding.sh\n+++ b/t/t9822-git-p4-path-encoding.sh\n@@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths'\n UTF8_ESCAPED=\"a-\\303\\244_o-\\303\\266_u-\\303\\274.txt\"\n ISO8859_ESCAPED=\"a-\\344_o-\\366_u-\\374.txt\"\n \n+ISO8859=\"$(printf \"$ISO8859_ESCAPED\")\" &&\n+echo content123 >\"$ISO8859\" &&\n+rm \"$ISO8859\" || {\n+\tskip_all=\"fs does not accept ISO-8859-1 filenames\"\n+\ttest_done\n+}\n+\n test_expect_success 'start p4d' '\n \tstart_p4d\n '\n-- \ngitgitgadget\n\n"},{"id":"373789","messageId":"CAE5ih79dyauRN3Kc17JMAx+p6dWFsy-P_1G=jTug-i9T=RrKLw@mail.gmail.com","threadId":"50925","inReplyTo":"52681aee0a9657691521baf13f792bcfb9eeb898.1555069181.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] t9822: skip tests if file names cannot be ISO-8895-1 encoded","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2019-04-13T07:39:05Z","receivedAt":"2019-04-13T07:39:10Z","isPatch":true,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On Fri, 12 Apr 2019 at 12:39, Johannes Schindelin via GitGitGadget\n wrote:\n>\n> From: Johannes Schindelin \n>\n> Most notably, it seems that macOS' APFS does not allow that.\n\nDid you mean in the subject \"ISO-8895-1\" encoded or \"ISO-8859-1\" encoded?\n\nIt seems reasonable other than that!\n\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n> t/t9822-git-p4-path-encoding.sh | 7 +++++++\n> 1 file changed, 7 insertions(+)\n>\n> diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh\n> index c78477c19b..de0b46581d 100755\n> --- a/t/t9822-git-p4-path-encoding.sh\n> +++ b/t/t9822-git-p4-path-encoding.sh\n> @@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths'\n> UTF8_ESCAPED=\"a-\\303\\244_o-\\303\\266_u-\\303\\274.txt\"\n> ISO8859_ESCAPED=\"a-\\344_o-\\366_u-\\374.txt\"\n>\n> +ISO8859=\"$(printf \"$ISO8859_ESCAPED\")\" &&\n> +echo content123 >\"$ISO8859\" &&\n> +rm \"$ISO8859\" || {\n> + skip_all=\"fs does not accept ISO-8859-1 filenames\"\n> + test_done\n> +}\n> +\n> test_expect_success 'start p4d' '\n> start_p4d\n> '\n> --\n> gitgitgadget\n>\n"},{"id":"373823","messageId":"nycvar.QRO.7.76.6.1904142138130.45@tvgsbejvaqbjf.bet","threadId":"50925","inReplyTo":"CAE5ih79dyauRN3Kc17JMAx+p6dWFsy-P_1G=jTug-i9T=RrKLw@mail.gmail.com","subject":"Re: [PATCH 1/2] t9822: skip tests if file names cannot be ISO-8895-1 encoded","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-04-14T19:38:52Z","receivedAt":"2019-04-14T19:39:12Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Luke,\n\nOn Sat, 13 Apr 2019, Luke Diamand wrote:\n\n> On Fri, 12 Apr 2019 at 12:39, Johannes Schindelin via GitGitGadget\n> wrote:\n> >\n> > From: Johannes Schindelin \n> >\n> > Most notably, it seems that macOS' APFS does not allow that.\n>\n> Did you mean in the subject \"ISO-8895-1\" encoded or \"ISO-8859-1\" encoded?\n\nD'oh... Fixed in v2!\n\n> It seems reasonable other than that!\n\nThanks,\nDscho\n"},{"id":"373831","messageId":"6161c76702246ab34a520dae8104ad489b89b6a1.1555276767.git.gitgitgadget@gmail.com","threadId":"50925","inReplyTo":"pull.179.v2.git.gitgitgadget@gmail.com","subject":"[PATCH v2 1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-04-14T21:19:29Z","receivedAt":"2019-04-14T21:19:32Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nMost notably, it seems that macOS' APFS does not allow that.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9822-git-p4-path-encoding.sh | 7 +++++++\n 1 file changed, 7 insertions(+)\n\ndiff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh\nindex c78477c19b..de0b46581d 100755\n--- a/t/t9822-git-p4-path-encoding.sh\n+++ b/t/t9822-git-p4-path-encoding.sh\n@@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths'\n UTF8_ESCAPED=\"a-\\303\\244_o-\\303\\266_u-\\303\\274.txt\"\n ISO8859_ESCAPED=\"a-\\344_o-\\366_u-\\374.txt\"\n \n+ISO8859=\"$(printf \"$ISO8859_ESCAPED\")\" &&\n+echo content123 >\"$ISO8859\" &&\n+rm \"$ISO8859\" || {\n+\tskip_all=\"fs does not accept ISO-8859-1 filenames\"\n+\ttest_done\n+}\n+\n test_expect_success 'start p4d' '\n \tstart_p4d\n '\n-- \ngitgitgadget\n\n"},{"id":"373832","messageId":"pull.179.v2.git.gitgitgadget@gmail.com","threadId":"50925","inReplyTo":"pull.179.git.gitgitgadget@gmail.com","subject":"[PATCH v2 0/2] Prepare our git-p4 tests for running on APFS","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-04-14T21:19:28Z","receivedAt":"2019-04-14T21:19:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Yesterday, the macOS agents of Azure Pipelines were upgraded to Mojave, and\nsince that does not support HFS+ anymore, everything will be upgraded to\nAPFS.\n\nAs I just found yesterday, we have one test that fails on that filesystem\n(t9822, which is only run if Perforce's p4d is available).\n\nThe first patch adds a workaround, as I failed to find any way to finagle\nAPFS into accepting that ISO-8859-1 encoded file name.\n\nThe second patch is a fix to make things compile on Mojave again, apparently\nHomebrew changed and the /usr/local/ directories need to be added to the\ncompiler and linker flags explicitly. Maybe this is a gcc-8 only thing, as\nit seems to have affected only the osx-gcc job, not the osx-clang job.\n\nChanges since v1:\n\n * Fix the tyop in the oneline of the first patch where it should talk about\n ISO-8859-1.\n\nJohannes Schindelin (2):\n t9822: skip tests if file names cannot be ISO-8859-1 encoded\n macOS: make sure that gettext is found\n\n config.mak.uname | 2 ++\n t/t9822-git-p4-path-encoding.sh | 7 +++++++\n 2 files changed, 9 insertions(+)\n\n\nbase-commit: e35b8cb8e212e3557efc565157ceb5cbaaf0d87f\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-179%2Fdscho%2Fskip-t9822-on-apfs-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-179/dscho/skip-t9822-on-apfs-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/179\n\nRange-diff vs v1:\n\n 1: 52681aee0a ! 1: 6161c76702 t9822: skip tests if file names cannot be ISO-8895-1 encoded\n @@ -1,6 +1,6 @@\n Author: Johannes Schindelin \n \n - t9822: skip tests if file names cannot be ISO-8895-1 encoded\n + t9822: skip tests if file names cannot be ISO-8859-1 encoded\n \n Most notably, it seems that macOS' APFS does not allow that.\n \n 2: f006524f78 = 2: 25be67b1b7 macOS: make sure that gettext is found\n\n-- \ngitgitgadget\n"},{"id":"373833","messageId":"25be67b1b74e585571213c9af1a314b95969090b.1555276767.git.gitgitgadget@gmail.com","threadId":"50925","inReplyTo":"pull.179.v2.git.gitgitgadget@gmail.com","subject":"[PATCH v2 2/2] macOS: make sure that gettext is found","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-04-14T21:19:29Z","receivedAt":"2019-04-14T21:19:40Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nDue to reasons (some XCode versions seem to include gettext, some\ndon't?), Homebrew does not expose the libraries and headers in\n/usr/local/ by default anymore.\n\nLet's help find them again.\n\nNote: for some reason, this is a change of behavior caused by the\nupgrade to Mojave, identified in our Azure Pipeline; it seems that\nHomebrew used to add the /usr/local/ directories to the include and link\nsearch path before, but now it no longer does.\n\nSigned-off-by: Johannes Schindelin \n---\n config.mak.uname | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 41e85fab1c..3605fead53 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -114,6 +114,8 @@ ifeq ($(uname_S),Darwin)\n \tHAVE_BSD_SYSCTL = YesPlease\n \tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n \tHAVE_NS_GET_EXECUTABLE_PATH = YesPlease\n+\tBASIC_CFLAGS += -I/usr/local/include\n+\tBASIC_LDFLAGS += -L/usr/local/lib\n endif\n ifeq ($(uname_S),SunOS)\n \tNEEDS_SOCKET = YesPlease\n-- \ngitgitgadget\n"},{"id":"373856","messageId":"nycvar.QRO.7.76.6.1904151434520.44@tvgsbejvaqbjf.bet","threadId":"50925","inReplyTo":"6161c76702246ab34a520dae8104ad489b89b6a1.1555276767.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-04-15T12:37:13Z","receivedAt":"2019-04-15T12:37:21Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Sun, 14 Apr 2019, Johannes Schindelin via GitGitGadget wrote:\n\n> From: Johannes Schindelin \n>\n> Most notably, it seems that macOS' APFS does not allow that.\n>\n> Signed-off-by: Johannes Schindelin \n\nThis is actually a quite important fix, really, as it makes *every* CI\nbuild fail in the macOS part, meaning that I am swamped with false\npositives until this is fixed.\n\nIt seems not to have made it into the js/macos-gettext-build branch,\nthough. Would you terribly mind picking it up, please?\n\nThanks,\nDscho\n"},{"id":"373861","messageId":"CAPc5daVRq+tisZqpGVXTwHo7kgKUSfjB6dmjLTUQKqQ+Xh_5eg@mail.gmail.com","threadId":"50925","inReplyTo":"nycvar.QRO.7.76.6.1904151434520.44@tvgsbejvaqbjf.bet","subject":"Re: [PATCH v2 1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-04-15T12:53:31Z","receivedAt":"2019-04-15T12:53:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin\n wrote:\n>\n> It seems not to have made it into the js/macos-gettext-build branch,\n> though. Would you terribly mind picking it up, please?\n\nI think they are separately queued, so that they can graduate in any order,\neven if/when one of them turns out to need rerolling.\n"},{"id":"374029","messageId":"nycvar.QRO.7.76.6.1904171346550.46@tvgsbejvaqbjf.bet","threadId":"50925","inReplyTo":"CAPc5daVRq+tisZqpGVXTwHo7kgKUSfjB6dmjLTUQKqQ+Xh_5eg@mail.gmail.com","subject":"Re: [PATCH v2 1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-04-17T11:48:22Z","receivedAt":"2019-04-17T11:48:28Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Mon, 15 Apr 2019, Junio C Hamano wrote:\n\n> On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin\n> wrote:\n> >\n> > It seems not to have made it into the js/macos-gettext-build branch,\n> > though. Would you terribly mind picking it up, please?\n>\n> I think they are separately queued, so that they can graduate in any order,\n> even if/when one of them turns out to need rerolling.\n\nOkay.\n\nPlease note, though, that I had packaged them together because they *both*\nneed to advance to any branch in order to make it pass on Azure Pipelines\nagain. (And to be sure, they both fix real bugs in Git, they are not mere\nworkarounds necessary to make the CI builds \"green\" again.)\n\nCiao,\nDscho\n"}]}