Re: [PATCH 4/4] Add test for passfd

[Bruno Haible]

Hello Bastien,

> Add simple testing for passfd
> ---
>  modules/passfd-tests |   11 +++++
>  tests/test-passfd.c  |  112 
> ++++++++++++++++++++++++++++++++++++++++++++++++++

I added this too, untabified, and with this ChangeLog entry and tweaks:


2011-03-07  Bastien Roucariès  <address@hidden>

        passfd module, part 4.
        * modules/passfd-tests: New file.
        * tests/test-passfd.c: New file.

2011-03-13  Bruno Haible  <address@hidden>

        passfd module, part 4, tweaks.
        * tests/test-passfd.c: Reorder includes.
        (main): Fix perror and printf calls.

--- tests/test-passfd.c.orig    Sun Mar 13 20:18:22 2011
+++ tests/test-passfd.c Sun Mar 13 19:55:45 2011
@@ -1,5 +1,5 @@
-/* Test of terminating the current process.
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+/* Test of passing file descriptors.
+   Copyright (C) 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,18 +14,17 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Written by Bruno Haible <address@hidden>, 2010.  */
-
 #include <config.h>
+
+#include "passfd.h"
+
+#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "passfd.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-
 
 #include "macros.h"
 
@@ -57,7 +56,7 @@
   pid = fork ();
   if (pid == -1)
     {
-      perror ("fork:");
+      perror ("fork");
       return 3;
     }
   if (pid == 0)
@@ -65,7 +64,7 @@
       ret = sendfd (pair[1], fdnull);
       if (ret == -1)
         {
-          perror ("sendfd:");
+          perror ("sendfd");
           return 64;
         }
       return 0;
@@ -82,7 +81,7 @@
       ret = waitpid (pid, &status, 0);
       if (ret == -1)
         {
-          perror ("waitpid:");
+          perror ("waitpid");
           return 17;
         }
       ASSERT (ret == pid);
@@ -96,7 +95,7 @@
       ret = WEXITSTATUS (status);
       if (ret != 0)
         {
-          fprintf (stderr, "Send fd fail");
+          fprintf (stderr, "Send fd fail\n");
           return ret;
         }
 
@@ -104,7 +103,7 @@
       ret == fstat (fd, &st);
       if (0 != ret)
         {
-          perror("fstat:");
+          perror ("fstat");
           return 80;
         }
       return 0;

-- 
In memoriam Odette Sansom <http://en.wikipedia.org/wiki/Odette_Hallowes>