Re: CVS commit: src/external/bsd/atf/dist/atf-run

[christos%astron.com@localhost (Christos Zoulas)]

In article <20110317194537.13ADB175D0%cvs.netbsd.org@localhost>,
Julio Merino <source-changes-d%NetBSD.org@localhost> wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  jmmv
>Date:          Thu Mar 17 19:45:36 UTC 2011
>
>Modified Files:
>       src/external/bsd/atf/dist/atf-run: test-program.cpp
>
>Log Message:
>Pull up revision 3dd2481ec97b2fde76521939b6451d03ce989745 from upstream:
>
>Really kill subprocesses of a test case before waiting for its completion
>
>Before waiting for any leftover output of the test case after it terminates,
>we must ensure that all of its subprocess are really, really dead.  Otherwise,
>these subprocesses may be sharing the stdout of the test case, in which case
>our wait will block (potentially indefinitely).
>
>This finally (well, hopefully) fixes some random lockups exposed by the
>NetBSD test suite.  Reported by Antti Kantee after
>tests/fs/vfs/t_full:p2k_ffs_fillfs was exposing this problem in a pretty
>reproducible manner.
>
>
>To generate a diff of this commit:
>cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/dist/atf-run/test-program.cpp
>
>Please note that diffs are not public domain; they are subject to the
>copyright notices on the relevant files.
>
>
>-=-=-=-=-=-
>
>Modified files:
>
>Index: src/external/bsd/atf/dist/atf-run/test-program.cpp
>diff -u src/external/bsd/atf/dist/atf-run/test-program.cpp:1.7
>src/external/bsd/atf/dist/atf-run/test-program.cpp:1.8
>--- src/external/bsd/atf/dist/atf-run/test-program.cpp:1.7     Tue Nov 16
>17:55:56 2010
>+++ src/external/bsd/atf/dist/atf-run/test-program.cpp Thu Mar 17 19:45:36 2011
>@@ -1,7 +1,7 @@
> //
> // Automated Testing Framework (atf)
> //
>-// Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
>+// Copyright (c) 2007, 2008, 2009, 2010, 2011 The NetBSD Foundation, Inc.
> // All rights reserved.
> //
> // Redistribution and use in source and binary forms, with or without
>@@ -724,10 +724,9 @@
>         UNREACHABLE;
>     }
> 
>-    ::killpg(child_pid, SIGTERM);
>+    ::killpg(child_pid, SIGKILL);

This is not very polite, as you are not giving them a chance to cleanup.

christos