RE: [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

From: Randall S. Becker <rsbecker@nexbridge.com>
Date: Feb 11, 2019, 14:09 UTC
Message-ID: <000601d4c213$6c7ee650$457cb2f0$@nexbridge.com>
In-Reply-To: <CACsJy8Bn+2zY6y_QqCjbB3qWM-F=3d0H5vgWj4az=md2FZ8RhA@mail.gmail.com>

On February 11, 2019 4:57, Duy Nguyen <pclouds@gmail.com> wrote:

Show 12 quoted lines

> On Mon, Feb 11, 2019 at 2:09 AM Randall S. Becker
> <rsbecker@nexbridge.com> wrote:
> >
> > Hi All,
> >
> > I tracked down a breakage in t1404 subtest 52. The line
> >
> > test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists"
> > err
> 
> The message does not match, does it? Here we grep for "File exists"
> but the message you showed says "File already exists"

So if I understand this correctly, it means that NonStop is reporting a different textual error that other platforms, but is still sane. Would a fix as follows be appropriate?

@@ -614,7 +614,12 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '
        test_when_finished "rm -f .git/packed-refs.lock" &&
        test_must_fail git update-ref -d $prefix/foo >out 2>err &&
        git for-each-ref $prefix >actual &&
-       test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
+       # Handle a difference in error reporting text on NonStop
+       if [ `uname` != "NONSTOP_KERNEL" ]; then \
+               test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err ; \
+       else \
+               test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File already exists" err ; \
+       fi &&
        test_cmp unchanged actual

I'm not at all confident that the committers will like a hack like this but it does work.

Regards,
Randall