cpp/src/tests/ForkedBroker.cpp: supress misleading exceptions with kill -9.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749756 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 4 deletions

diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp
index 2b90068549..f970c384f7 100644
--- a/cpp/src/tests/ForkedBroker.cpp
+++ b/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)));
 }
 
diff --git a/cpp/src/tests/failover_soak.cpp b/cpp/src/tests/failover_soak.cpp
index f8ae2b903d..65c93c8e27 100644
--- a/cpp/src/tests/failover_soak.cpp
+++ b/cpp/src/tests/failover_soak.cpp
@@ -269,9 +269,8 @@ children allMyChildren;
 
 
 void 
-childExit ( int signalNumber ) 
+childExit ( int ) 
 {
-    signalNumber ++;  // Now maybe the compiler willleave me alone?
     int  childReturnCode; 
     pid_t pid = waitpid ( 0, & childReturnCode, WNOHANG);