Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Jeff King
On Wed, Nov 09, 2016 at 03:36:40PM +0100, Andreas Schwab wrote: > On Nov 09 2016, Johannes Schindelin wrote: > > > The reason why we do not ignore kill errors is that we want to make sure > > that the script *actually ran*. Otherwise, the thing we need to test here > > does not necessarily get t

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Andreas Schwab
On Nov 09 2016, Johannes Schindelin wrote: > The reason why we do not ignore kill errors is that we want to make sure > that the script *actually ran*. Otherwise, the thing we need to test here > does not necessarily get tested. That can be tested by looking for the pid file. Andreas. -- Andr

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Johannes Schindelin
Hi On Tue, 8 Nov 2016, Jeff King wrote: > On Tue, Nov 08, 2016 at 06:03:04PM +0100, Andreas Schwab wrote: > > > Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end > > of test case") added a kill command to clean up after the test, but this > > can fail if the sleep command

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-08 Thread Jeff King
On Tue, Nov 08, 2016 at 06:03:04PM +0100, Andreas Schwab wrote: > Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end > of test case") added a kill command to clean up after the test, but this > can fail if the sleep command exits before the cleanup is executed. > Ignore the e

[PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-08 Thread Andreas Schwab
Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end of test case") added a kill command to clean up after the test, but this can fail if the sleep command exits before the cleanup is executed. Ignore the error from the kill command. Signed-off-by: Andreas Schwab --- The failu