From 994f1b1e831cb1687a1bdc5f7f921b452b822dfe Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 3 Mar 2007 01:47:40 +0000 Subject: [PATCH] Avoid link error due to program_name. --- ChangeLog | 8 ++++++++ modules/array-oset-tests | 1 + modules/avltree-list-tests | 1 + modules/avltree-oset-tests | 1 + modules/avltreehash-list-tests | 1 + tests/test-array_oset.c | 3 +++ tests/test-avltree_list.c | 6 ++++-- tests/test-avltree_oset.c | 6 ++++-- tests/test-avltreehash_list.c | 8 ++++++-- 9 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e66daaf90..5e3134317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-03-02 Bruno Haible + * modules/avltree-oset-tests (Depends-on): Add progname. + * tests/test-avltree_oset.c: Include progname.h. + (main): Call set_program_name. + + * modules/avltree-list-tests (Depends-on): Add progname. + * tests/test-avltree_list.c: Include progname.h. + (main): Call set_program_name. + * modules/array-oset-tests (Depends-on): Add progname. * tests/test-array_oset.c: Include progname.h. (main): Call set_program_name. diff --git a/modules/array-oset-tests b/modules/array-oset-tests index 6a0062330..6079e85d5 100644 --- a/modules/array-oset-tests +++ b/modules/array-oset-tests @@ -3,6 +3,7 @@ tests/test-array_oset.c Depends-on: array-list +progname configure.ac: diff --git a/modules/avltree-list-tests b/modules/avltree-list-tests index 43c0f4688..03a490dfd 100644 --- a/modules/avltree-list-tests +++ b/modules/avltree-list-tests @@ -3,6 +3,7 @@ tests/test-avltree_list.c Depends-on: array-list +progname configure.ac: diff --git a/modules/avltree-oset-tests b/modules/avltree-oset-tests index 6e8eec396..92298dcca 100644 --- a/modules/avltree-oset-tests +++ b/modules/avltree-oset-tests @@ -3,6 +3,7 @@ tests/test-avltree_oset.c Depends-on: array-oset +progname configure.ac: diff --git a/modules/avltreehash-list-tests b/modules/avltreehash-list-tests index 983e8a2df..dd013d212 100644 --- a/modules/avltreehash-list-tests +++ b/modules/avltreehash-list-tests @@ -3,6 +3,7 @@ tests/test-avltreehash_list.c Depends-on: array-list +progname configure.ac: diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c index 8e23eb1de..b28e3d219 100644 --- a/tests/test-array_oset.c +++ b/tests/test-array_oset.c @@ -26,6 +26,7 @@ #include #include "gl_array_list.h" +#include "progname.h" static const char *objects[30] = { @@ -75,6 +76,8 @@ main (int argc, char *argv[]) gl_oset_t set1; gl_list_t 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-avltree_list.c b/tests/test-avltree_list.c index 26d33962f..b8bd0df2f 100644 --- a/tests/test-avltree_list.c +++ b/tests/test-avltree_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 , 2006. This program is free software; you can redistribute it and/or modify @@ -20,10 +20,12 @@ # include #endif +#include "gl_avltree_list.h" + #include #include "gl_array_list.h" -#include "gl_avltree_list.h" +#include "progname.h" extern void gl_avltree_list_check_invariants (gl_list_t list); diff --git a/tests/test-avltree_oset.c b/tests/test-avltree_oset.c index 02066f640..c5c724873 100644 --- a/tests/test-avltree_oset.c +++ b/tests/test-avltree_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 , 2006. This program is free software; you can redistribute it and/or modify @@ -20,11 +20,13 @@ # include #endif +#include "gl_avltree_oset.h" + #include #include #include "gl_array_oset.h" -#include "gl_avltree_oset.h" +#include "progname.h" extern void gl_avltree_oset_check_invariants (gl_oset_t set); diff --git a/tests/test-avltreehash_list.c b/tests/test-avltreehash_list.c index dc1f6e85b..1d0fa49aa 100644 --- a/tests/test-avltreehash_list.c +++ b/tests/test-avltreehash_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 , 2006. This program is free software; you can redistribute it and/or modify @@ -20,12 +20,14 @@ # include #endif +#include "gl_avltreehash_list.h" + #include #include #include #include "gl_array_list.h" -#include "gl_avltreehash_list.h" +#include "progname.h" extern void gl_avltreehash_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])); -- 2.11.0