Re: filenamecat-tests & fstrcmp-tests: needs program_name symbol

[Bruno Haible]

Simon Josefsson wrote:
> How about the patch below?  Tested on debian lenny x86 and mac os x
> 10.4.

Looks perfect.

Additionally, a few tests are using module 'progname' but are not
initializing it upon program startup. This fixes it.


2009-01-18  Bruno Haible  <address@hidden>

        * tests/test-avltree_list.c (main): Call set_program_name.
        * tests/test-avltree_oset.c (main): Likewise.
        * tests/test-obstack-printf.c: Include progname.h.
        (main): Call set_program_name.
        * tests/test-quotearg.c: Include progname.h.
        (main): Call set_program_name.
        * tests/test-xmemdup0.c: Include progname.h.
        (main): Call set_program_name.

--- tests/test-avltree_list.c.orig      2009-01-18 18:30:46.000000000 +0100
+++ tests/test-avltree_list.c   2009-01-18 18:28:53.000000000 +0100
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -74,6 +74,8 @@
 {
   gl_list_t list1, list2, list3;
 
+  set_program_name (argv[0]);
+
   /* Allow the user to provide a non-default random seed on the command line.  
*/
   if (argc > 1)
     srand (atoi (argv[1]));
--- tests/test-avltree_oset.c.orig      2009-01-18 18:30:46.000000000 +0100
+++ tests/test-avltree_oset.c   2009-01-18 18:28:53.000000000 +0100
@@ -1,5 +1,5 @@
 /* Test of ordered set data type implementation.
-   Copyright (C) 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -84,6 +84,8 @@
 {
   gl_oset_t set1, set2;
 
+  set_program_name (argv[0]);
+
   /* Allow the user to provide a non-default random seed on the command line.  
*/
   if (argc > 1)
     srand (atoi (argv[1]));
--- tests/test-obstack-printf.c.orig    2009-01-18 18:30:46.000000000 +0100
+++ tests/test-obstack-printf.c 2009-01-18 18:28:54.000000000 +0100
@@ -1,5 +1,5 @@
 /* Test of obstack_printf() and obstack_vprintf() functions.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 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
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "progname.h"
+
 #define ASSERT(expr) \
   do                                                                        \
     {                                                                       \
@@ -134,6 +136,8 @@
 int
 main (int argc, char *argv[])
 {
+  set_program_name (argv[0]);
+
   test_obstack_vprintf ();
   test_obstack_printf ();
   return 0;
--- tests/test-quotearg.c.orig  2009-01-18 18:30:46.000000000 +0100
+++ tests/test-quotearg.c       2009-01-18 18:28:54.000000000 +0100
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 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
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "progname.h"
+
 #if ENABLE_NLS
 /* On Linux, gettext is optionally defined as a forwarding macro,
    which would cause syntax errors in our definition below.  But on
@@ -284,10 +286,12 @@
 #endif /* ENABLE_NLS */
 
 int
-main ()
+main (int argc, char *argv[])
 {
   int i;
 
+  set_program_name (argv[0]);
+
   /* This program is hard-wired to the C locale since it does not call
      setlocale.  */
   ASSERT (!isprint ('\033'));
--- tests/test-xmemdup0.c.orig  2009-01-18 18:30:46.000000000 +0100
+++ tests/test-xmemdup0.c       2009-01-18 18:28:54.000000000 +0100
@@ -1,5 +1,5 @@
 /* Test of xmemdup0() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 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
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "progname.h"
+
 #define ASSERT(expr) \
   do                                                                        \
     {                                                                       \
@@ -43,6 +45,8 @@
   char buffer[10] = { 'a', 'b', 'c', 'd', '\0',
                      'f', 'g', 'h', 'i', 'j'   };
 
+  set_program_name (argv[0]);
+
   /* Empty string.  */
   {
     char *result = xmemdup0 (NULL, 0);