Avoid link error due to program_name.

7 files changed, 27 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d7e5063e0c..cb56f8a673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2007-03-02  Bruno Haible  <bruno@clisp.org>
 
-	* modules/rbtreehash-list-tests (Depends-on): Add progname.
-	* tests/test-rbtreehash_list.c: Include progname.h.
+	* modules/rbtree-oset-tests (Depends-on): Add progname.
+	* tests/test-rbtree_oset.c: Include progname.h.
+	(main): Call set_program_name.
+
+	* modules/rbtree-list-tests (Depends-on): Add progname.
+	* tests/test-rbtree_list.c: Include progname.h.
 	(main): Call set_program_name.
 
 	* modules/linked-list-tests (Depends-on): Add progname.
diff --git a/modules/rbtree-list-tests b/modules/rbtree-list-tests
index 8fd2f4c6dd..4b79fa1c8e 100644
--- a/modules/rbtree-list-tests
+++ b/modules/rbtree-list-tests
@@ -3,6 +3,7 @@ tests/test-rbtree_list.c
 
 Depends-on:
 array-list
+progname
 
 configure.ac:
 
diff --git a/modules/rbtree-oset-tests b/modules/rbtree-oset-tests
index 0b00165283..4bcbd3d86e 100644
--- a/modules/rbtree-oset-tests
+++ b/modules/rbtree-oset-tests
@@ -3,6 +3,7 @@ tests/test-rbtree_oset.c
 
 Depends-on:
 array-oset
+progname
 
 configure.ac:
 
diff --git a/modules/rbtreehash-list-tests b/modules/rbtreehash-list-tests
index dbb74e7403..07ba48b1f6 100644
--- a/modules/rbtreehash-list-tests
+++ b/modules/rbtreehash-list-tests
@@ -3,6 +3,7 @@ tests/test-rbtreehash_list.c
 
 Depends-on:
 array-list
+progname
 
 configure.ac:
 
diff --git a/tests/test-rbtree_list.c b/tests/test-rbtree_list.c
index 70af1a40e8..d07e9e46fa 100644
--- a/tests/test-rbtree_list.c
+++ b/tests/test-rbtree_list.c
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,12 @@
 # include <config.h>
 #endif
 
+#include "gl_rbtree_list.h"
+
 #include <stdlib.h>
 
 #include "gl_array_list.h"
-#include "gl_rbtree_list.h"
+#include "progname.h"
 
 extern void gl_rbtree_list_check_invariants (gl_list_t list);
 
@@ -64,6 +66,8 @@ main (int argc, char *argv[])
 {
   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]));
diff --git a/tests/test-rbtree_oset.c b/tests/test-rbtree_oset.c
index f6c3e69ef4..735a2f692f 100644
--- a/tests/test-rbtree_oset.c
+++ b/tests/test-rbtree_oset.c
@@ -1,5 +1,5 @@
 /* Test of ordered set data type implementation.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,11 +20,13 @@
 # include <config.h>
 #endif
 
+#include "gl_rbtree_oset.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_oset.h"
-#include "gl_rbtree_oset.h"
+#include "progname.h"
 
 extern void gl_rbtree_oset_check_invariants (gl_oset_t set);
 
@@ -74,6 +76,8 @@ main (int argc, char *argv[])
 {
   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]));
diff --git a/tests/test-rbtreehash_list.c b/tests/test-rbtreehash_list.c
index c8a572c0ec..4d98451c75 100644
--- a/tests/test-rbtreehash_list.c
+++ b/tests/test-rbtreehash_list.c
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,12 +20,14 @@
 # include <config.h>
 #endif
 
+#include "gl_rbtreehash_list.h"
+
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_list.h"
-#include "gl_rbtreehash_list.h"
+#include "progname.h"
 
 extern void gl_rbtreehash_list_check_invariants (gl_list_t list);
 
@@ -91,6 +93,8 @@ main (int argc, char *argv[])
 {
   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]));