[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-7-g11b240f

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  11b240f3f197096e420f91f5fe16b6c5c93f71db (commit)
      from  eeff85669ae3ac91ffa774d7194a8e1e3845c1bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 11b240f3f197096e420f91f5fe16b6c5c93f71db
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Dec 26 05:21:34 2009 +0100

    Kill the fork server on exceptions.

diff --git a/myserver/tests/test_fork_server.cpp 
b/myserver/tests/test_fork_server.cpp
index 01901ee..754c7d5 100644
--- a/myserver/tests/test_fork_server.cpp
+++ b/myserver/tests/test_fork_server.cpp
@@ -52,60 +52,72 @@ public:
 
   void testStartKillLoop ()
   {
+    try
+      {
 #ifndef WIN32
-    CPPUNIT_ASSERT_EQUAL (fs->isInitialized (), false);
-
-    int ret = fs->startForkServer ();
-
-    CPPUNIT_ASSERT_EQUAL (ret, 0);
-
-    CPPUNIT_ASSERT_EQUAL (fs->isInitialized (), true);
-
-    fs->killServer ();
+        CPPUNIT_ASSERT_EQUAL (fs->isInitialized (), false);
+        int ret = fs->startForkServer ();
+        CPPUNIT_ASSERT_EQUAL (ret, 0);
+        CPPUNIT_ASSERT_EQUAL (fs->isInitialized (), true);
+        fs->killServer ();
 #endif
+      }
+    catch (...)
+      {
+        fs->killServer ();
+        throw;
+      }
   }
 
   void testExecuteProcess ()
   {
+    try
+      {
 #ifndef WIN32
-    int pid = 0;
-    int port = 0;
-    StartProcInfo spi;
-    char buffer [32] = {'\0'};
-    const char *msg = "ForkServer";
-    u_long nbr;
-    int ret = fs->startForkServer ();
+        int pid = 0;
+        int port = 0;
+        StartProcInfo spi;
+        char buffer [32] = {'\0'};
+        const char *msg = "ForkServer";
+        u_long nbr;
+        int ret = fs->startForkServer ();
 
-    Pipe pipe;
-    pipe.create ();
+        Pipe pipe;
+        pipe.create ();
 
-    spi.stdIn = -1;
-    spi.stdError = -1;
-    spi.stdOut =  pipe.getWriteHandle ();
+        spi.stdIn = -1;
+        spi.stdError = -1;
+        spi.stdOut =  pipe.getWriteHandle ();
 
-    if (!FilesUtility::fileExists ("/bin/echo"))
-      return;
+        if (!FilesUtility::fileExists ("/bin/echo"))
+          return;
 
-    spi.cmd.assign ("/bin/echo");
-    spi.arg.assign (msg);
-    spi.cwd.assign ("");
-    spi.envString = NULL;
+        spi.cmd.assign ("/bin/echo");
+        spi.arg.assign (msg);
+        spi.cwd.assign ("");
+        spi.envString = NULL;
 
-    ret = fs->executeProcess (&spi, ForkServer::FLAG_USE_OUT, &pid, &port);
-    pipe.closeWrite ();
+        ret = fs->executeProcess (&spi, ForkServer::FLAG_USE_OUT, &pid, &port);
+        pipe.closeWrite ();
 
-    CPPUNIT_ASSERT_EQUAL (ret, 0);
+        CPPUNIT_ASSERT_EQUAL (ret, 0);
 
-    ret = pipe.read (buffer, 32, &nbr);
+        ret = pipe.read (buffer, 32, &nbr);
 
-    CPPUNIT_ASSERT_EQUAL (ret, 0);
+        CPPUNIT_ASSERT_EQUAL (ret, 0);
 
-    CPPUNIT_ASSERT_EQUAL (strncmp (buffer, msg, strlen (msg)), 0);
+        CPPUNIT_ASSERT_EQUAL (strncmp (buffer, msg, strlen (msg)), 0);
 
-    pipe.closeRead ();
+        pipe.closeRead ();
 
-    fs->killServer ();
+        fs->killServer ();
 #endif
+      }
+    catch (...)
+      {
+        fs->killServer ();
+        throw;
+      }
   }
 
 };

-----------------------------------------------------------------------

Summary of changes:
 myserver/tests/test_fork_server.cpp |   82 ++++++++++++++++++++---------------
 1 files changed, 47 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
GNU MyServer