From cfcef6b2463a9cf207fdc12953c51043a3a687e8 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 23 Jun 2010 12:29:45 -0700 Subject: [PATCH] tests: Tolerate ignored SIGPIPE in daemon tests. I noticed that when I run "make check" inside an Emacs compile-mode buffer, the "daemon --detach closes standard fds" and "daemon --detach --monitor closes standard fds" tests failed. Investigation showed that Emacs ignores SIGPIPE in the compile subprocess, which caused the "yes" process in these tests to emit the message "yes: Broken pipe" and exit with status 1 instead of dying from SIGPIPE. This commit changes these tests to allow either behavior. --- tests/daemon.at | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/tests/daemon.at b/tests/daemon.at index d2b018048..06f1e6125 100644 --- a/tests/daemon.at +++ b/tests/daemon.at @@ -150,20 +150,40 @@ AT_CLEANUP AT_SETUP([daemon --detach closes standard fds]) AT_CAPTURE_FILE([pid]) +AT_CAPTURE_FILE([status]) +AT_CAPTURE_FILE([stderr]) OVSDB_INIT([db]) -AT_CHECK([(yes; echo $? > status) | ovsdb-server --detach --pidfile=$PWD/pid --unixctl=$PWD/unixctl db], [0], [], [stderr]) +AT_CHECK([(yes 2>stderr; echo $? > status) | ovsdb-server --detach --pidfile=$PWD/pid --unixctl=$PWD/unixctl db], [0], [], []) AT_CHECK([kill `cat pid`]) AT_CHECK([test -s status]) -AT_CHECK([kill -l `cat status`], [0], [PIPE +if grep '[[bB]]roken pipe' stderr >/dev/null 2>&1; then + # Something in the environment caused SIGPIPE to be ignored, but + # 'yes' at least told us that it got EPIPE. Good enough; we know + # that stdout was closed. + : +else + # Otherwise make sure that 'yes' died from SIGPIPE. + AT_CHECK([kill -l `cat status`], [0], [PIPE ]) +fi AT_CLEANUP AT_SETUP([daemon --detach --monitor closes standard fds]) AT_CAPTURE_FILE([pid]) +AT_CAPTURE_FILE([status]) +AT_CAPTURE_FILE([stderr]) OVSDB_INIT([db]) -AT_CHECK([(yes; echo $? > status) | ovsdb-server --detach --monitor --pidfile=$PWD/pid --unixctl=$PWD/unixctl db], [0], [], [stderr]) +AT_CHECK([(yes 2>stderr; echo $? > status) | ovsdb-server --detach --monitor --pidfile=$PWD/pid --unixctl=$PWD/unixctl db], [0], [], []) AT_CHECK([kill `cat pid`]) AT_CHECK([test -s status]) -AT_CHECK([kill -l `cat status`], [0], [PIPE +if grep '[[bB]]roken pipe' stderr >/dev/null 2>&1; then + # Something in the environment caused SIGPIPE to be ignored, but + # 'yes' at least told us that it got EPIPE. Good enough; we know + # that stdout was closed. + : +else + # Otherwise make sure that 'yes' died from SIGPIPE. + AT_CHECK([kill -l `cat status`], [0], [PIPE ]) +fi AT_CLEANUP -- 2.43.0