Update.
* dlfcn/Makefile (distribute): Add glreflib1.c and glreflib2.c. (tests): Add glrefmain. Add rules to build modules and run tests. Ignore result of glrefmain for now since it fails. * dlfcn/glrefmain.c: New file. * dlfcn/glreflib1.c: New file. * dlfcn/glreflib2.c: New file. * test-skeleton.c: Include <string.h> for strsignal prototype.
This commit is contained in:
Ulrich Drepper
parent
289e8e7ea1
commit
4380ef5e29
10
ChangeLog
10
ChangeLog
|
|
@ -1,5 +1,15 @@
|
|||
2000-04-01 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* dlfcn/Makefile (distribute): Add glreflib1.c and glreflib2.c.
|
||||
(tests): Add glrefmain.
|
||||
Add rules to build modules and run tests. Ignore result of glrefmain
|
||||
for now since it fails.
|
||||
* dlfcn/glrefmain.c: New file.
|
||||
* dlfcn/glreflib1.c: New file.
|
||||
* dlfcn/glreflib2.c: New file.
|
||||
|
||||
* test-skeleton.c: Include <string.h> for strsignal prototype.
|
||||
|
||||
* locale/programs/ld-collate.c (check_duplicate): Allow repertoire
|
||||
to be missing.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
# The GNU C Library is free software; you can redistribute it and/or
|
||||
|
|
@ -20,7 +20,7 @@ subdir := dlfcn
|
|||
headers := bits/dlfcn.h dlfcn.h
|
||||
extra-libs := libdl
|
||||
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr
|
||||
distribute := dlopenold.c
|
||||
distribute := dlopenold.c glreflib1.c glreflib2.c
|
||||
|
||||
extra-libs-others := libdl
|
||||
|
||||
|
|
@ -31,4 +31,21 @@ libdl-routines += dlopenold
|
|||
libdl-shared-only-routines := dlopenold
|
||||
endif
|
||||
|
||||
ifeq (yes,$(build-shared))
|
||||
tests = glrefmain
|
||||
endif
|
||||
modules-names = glreflib1 glreflib2
|
||||
extra-objs += $(modules-names:=.os)
|
||||
|
||||
include ../Rules
|
||||
|
||||
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
|
||||
$(test-modules): $(objpfx)%.so: $(objpfx)%.os
|
||||
$(build-module)
|
||||
|
||||
$(objpfx)glrefmain: $(objpfx)libdl.so
|
||||
$(objpfx)glrefmain.out: $(objpfx)glrefmain \
|
||||
$(objpfx)glreflib1.so $(objpfx)glreflib2.so
|
||||
-$(elf-objpfx)$(rtld-installed-name) \
|
||||
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
|
||||
$(objpfx)glrefmain > $@
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
/* Test for dependency tracking added by relocations.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
int
|
||||
ref1 (void)
|
||||
{
|
||||
return 42;
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
/* Test for dependency tracking added by relocations.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
extern int ref1 (void);
|
||||
|
||||
int
|
||||
ref2 (void)
|
||||
{
|
||||
return ref1 ();
|
||||
}
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
/* Test for dependency tracking added by relocations.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include <dlfcn.h>
|
||||
#include <error.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
static void *
|
||||
load (const char *name)
|
||||
{
|
||||
void *d = dlopen (name, RTLD_LAZY | RTLD_GLOBAL);
|
||||
if (d == NULL)
|
||||
error (EXIT_FAILURE, errno, "cannot load `%s'", name);
|
||||
return d;
|
||||
}
|
||||
|
||||
|
||||
#define TEST_FUNCTION do_test ()
|
||||
int
|
||||
do_test (void)
|
||||
{
|
||||
void *d1;
|
||||
void *d2;
|
||||
int (*f) (void);
|
||||
|
||||
d1 = load ("glreflib1.so");
|
||||
d2 = load ("glreflib2.so");
|
||||
|
||||
f = dlsym (d2, "ref2");
|
||||
if (f == NULL)
|
||||
error (EXIT_FAILURE, errno, "cannot get pointer to `%s'", "ref2");
|
||||
|
||||
if (f () != 42)
|
||||
error (EXIT_FAILURE, 0, "wrong result from `%s'", "ref2");
|
||||
|
||||
puts ("Correct result in first call");
|
||||
fflush (stdout);
|
||||
|
||||
/* Now unload the first file. */
|
||||
dlclose (d1);
|
||||
|
||||
puts ("About to call the second time");
|
||||
fflush (stdout);
|
||||
|
||||
/* Try calling the function again. */
|
||||
if (f () != 42)
|
||||
error (EXIT_FAILURE, 0, "wrong result from `%s' (second call)", "ref2");
|
||||
|
||||
puts ("Second call succeeded!");
|
||||
fflush (stdout);
|
||||
|
||||
dlclose (d2);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include "../test-skeleton.c"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/* Skeleton for test programs.
|
||||
Copyright (C) 1998 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 2000 Free Software Foundation, Inc.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/wait.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue