diff options
| author | Alan Conway <aconway@apache.org> | 2009-03-03 21:07:49 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-03-03 21:07:49 +0000 |
| commit | 708ac68871b1b3ea1865294d881cbcca873a2bec (patch) | |
| tree | 041ebae86c7b4d013a39368428051462e739b7f4 /qpid/cpp/src/tests/ForkedBroker.cpp | |
| parent | 5f34dd46b9269dd7d96a9f88b2cf7bd2f3e22d79 (diff) | |
| download | qpid-python-708ac68871b1b3ea1865294d881cbcca873a2bec.tar.gz | |
cpp/src/tests/ForkedBroker.cpp: supress misleading exceptions with kill -9.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749756 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/ForkedBroker.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/ForkedBroker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/ForkedBroker.cpp b/qpid/cpp/src/tests/ForkedBroker.cpp index 2b90068549..f970c384f7 100644 --- a/qpid/cpp/src/tests/ForkedBroker.cpp +++ b/qpid/cpp/src/tests/ForkedBroker.cpp @@ -41,9 +41,9 @@ void ForkedBroker::kill(int sig) { if (::kill(savePid, sig) < 0) throw ErrnoException("kill failed"); int status; - if (::waitpid(savePid, &status, 0) < 0) + if (::waitpid(savePid, &status, 0) < 0 && sig != 9) throw ErrnoException("wait for forked process failed"); - if (WEXITSTATUS(status) != 0) + if (WEXITSTATUS(status) != 0 && sig != 9) throw qpid::Exception(QPID_MSG("Forked broker exited with: " << WEXITSTATUS(status))); } |