On Mon, May 12, 2014 at 09:05:34AM +0200, Bernhard Voelker wrote:
> On 05/11/2014 09:26 PM, Sami Kerola wrote:
> > diff --git a/tests/ts/kill/kill_functions.sh b/tests/ts/kill/kill_functions.sh
> > index 73fff05..a2a2483 100644
> > --- a/tests/ts/kill/kill_functions.sh
> > +++ b/tests/ts/kill/kill_functions.sh
> > @@ -1,3 +1,5 @@
> > +# kill tests, or command, will not when /proc is missing.
> > +test /proc || ts_skip "/proc not available"
>
> Ahem, this only ensures that '/proc' is a string, nothing else ...
Fixed.
> > # unfortunately we are using gawk features
> > type gawk >/dev/null 2>&1 || ts_skip "cannot find gawk"
> > @@ -8,6 +10,17 @@ function check_test_sigreceive {
> > local pid=$1
> >
> > for i in 0.01 0.1 1 1 1 1; do
> > + if [ ! -f /proc/$pid/status ]; then
> > + # The /proc exists, but not status file. Because
> > + # the process already started it is unlikely the
> > + # file would appear after any amount of waiting.
> > + # Try to sleep for moment and hopefully
> > + # test_sigreceive is ready to be killed.
> > + echo "kill_functions.sh: /proc/$pid/status: No such file or directory"
> > + sleep 2
> > + rc=1
> > + break
> > + fi
> > gawk 'BEGIN { retval=1 }
> > /^SigCgt/ {
> > lbyte = strtonum("0x" substr($2, 16, 16))
> >
>
> Seeing all this /proc stuff going into the tests - it now even
> requires gawk - I still personally think that a simple witness
> file would have done it.
> So Karel, if you really prefer this, then I'm okay with it, of course.
The dependence on gawk is not nice thing, I have modified the function
to use simple awk print stuff and shell to convert & check sigmask.
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
