From: Bruno Haible <bruno@clisp.org>
Date: Sat, 4 Feb 2012 17:19:11 +0000 (+0100)
Subject: nonblocking-socket tests: Fix a NULL program name in a diagnostic.
X-Git-Tag: v0.1~1172
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=dc14031ee642f973cc7a96968d822d6f8c5f1bb2;p=gnulib.git

nonblocking-socket tests: Fix a NULL program name in a diagnostic.

* tests/test-nonblocking-socket-main.c: Include progname.h.
(main): Invoke set_program_name.
* modules/nonblocking-socket-tests (Depends-on): Add progname.
---

diff --git a/ChangeLog b/ChangeLog
index 714e6c005..2449e0093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-02-04  Bruno Haible  <bruno@clisp.org>
 
+	nonblocking-socket tests: Fix a NULL program name in a diagnostic.
+	* tests/test-nonblocking-socket-main.c: Include progname.h.
+	(main): Invoke set_program_name.
+	* modules/nonblocking-socket-tests (Depends-on): Add progname.
+
 	nonblocking-pipe tests: Fix a NULL program name in a diagnostic.
 	* tests/test-nonblocking-pipe-main.c: Include progname.h.
 	(main): Invoke set_program_name.
diff --git a/modules/nonblocking-socket-tests b/modules/nonblocking-socket-tests
index 2eb883ed3..9c3a614f7 100644
--- a/modules/nonblocking-socket-tests
+++ b/modules/nonblocking-socket-tests
@@ -16,6 +16,7 @@ unistd
 sys_socket
 nonblocking
 wait-process
+progname
 environ
 posix_spawnp
 netinet_in
diff --git a/tests/test-nonblocking-socket-main.c b/tests/test-nonblocking-socket-main.c
index 72b9f8721..42e0c9c98 100644
--- a/tests/test-nonblocking-socket-main.c
+++ b/tests/test-nonblocking-socket-main.c
@@ -33,6 +33,7 @@
 
 #include "nonblocking.h"
 #include "wait-process.h"
+#include "progname.h"
 
 #include "macros.h"
 #include "socket-server.h"
@@ -43,14 +44,19 @@
 int
 main (int argc, char *argv[])
 {
-  const char *child_path = argv[1];
-  int test = atoi (argv[2]);
+  const char *child_path;
+  int test;
   int server;
   int port;
   int child;
   int server_socket;
   int exitcode;
 
+  set_program_name (argv[0]);
+
+  child_path = argv[1];
+  test = atoi (argv[2]);
+
   /* Create a server socket.  */
   server = create_server (0, 1, &port);