Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 8, 2016, 16:34 UTC
- Message-ID
- <CAA19uiRsdc0eyZDqGtjpAcLyn=hyO4DXbhDbd=hoj8OxK2GK3A@mail.gmail.com>
- In-Reply-To
- <20160208135013.GA27054@sigill.intra.peff.net>
[warning: experimenting with forwarding to and replying from gmail...] 2016-02-08 14:50 GMT+01:00 Jeff King <peff@peff.net>:
Show 20 quoted lines
> On Sun, Feb 07, 2016 at 08:11:37PM +0100, Michael J Gruber wrote: > >> bcb11f1 (mingw: mark t9100's test cases with appropriate prereqs, 2016-01-27) >> replaced "/bin/sh" in exec.sh by the shell specified in SHELL_PATH, but >> that breaks the subtest which checks for a specific checksum of a tree >> containing. >> >> Revert that change that was not explained in the commit message anyways >> (exec.sh is never executed). > > I think this just re-breaks things on Windows. That first setup test > used "chmod +x" (which is brought back by your patch), without having > the POSIXPERM prerequisite. > > We probably do not want to mark the whole setup test as POSIXPERM, as > that would effectively break all of the other tests on Windows. The rest > of the tests need to be able to work whether or not the "chmod +x" was > run. It may be simpler to just break the executable-bit tests, including > setup, out to their own section of the script. >
The commit message does not explain that part of the patch at all - to me it looks as if the direct "echo" and "chmod +x" is simply replaced by calling a function which does just that, or more exactly, not quite:
> That being said, t9100 seems to pass for me, even at bcb11f1. Can you > show us the breakage you are seeing? > > -Peff
SHELL_PATH=/bin/dash (in config.mak)
As I explained in my commit message, the problem arises when SHELL_PATH is not "/bin/sh" and, consequently, the generated "exec.sh" results in a blob with a different sha1.
Just try "/usr/bin/sh" for good measure...
Michael
[This time plain text, hopefully, and thus vger-palatable. How do I make this default...]