system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix test failure with -DNDEBUG.

Browse Source 
The elf/tst-dlopen-aout.c test uses asserts to verify properties of the
test execution.  Instead of using assert it should use xpthread_create
and xpthread_join to catch errors starting the threads and fail the
test.  This shows up in Fedora 28 when building for i686-pc-linux-gnu
and using gcc 8.1.1.

Tested on i686, and fixes a check failure with -DNDEBUG.

Signed-off-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Carlos O'Donell 2018-08-30 11:01:33 -04:00
parent 2bda273aa3
commit d330f31af6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-08-30 Carlos O'Donell <carlos@redhat.com>
* elf/tst-dlopen-aout.c: Include support/xthread.h. Use
xpthread_create and xpthread_join.
2018-08-30 Florian Weimer <fweimer@redhat.com>
* stdlib/stdlib.h (reallocarray): Make available under __USE_MISC.

12
elf/tst-dlopen-aout.c
View File

@ -27,6 +27,7 @@
#include <dlfcn.h>
#include <stdio.h>
#include <pthread.h>
#include <support/xthread.h>
__thread int x;
@ -45,7 +46,6 @@ do_test (int argc, char *argv[])
{
pthread_t thr;
void *p;
int rc;
p = dlopen (argv[0], RTLD_LAZY);
if (p != NULL)
@ -53,11 +53,11 @@ do_test (int argc, char *argv[])
fprintf (stderr, "dlopen unexpectedly succeeded\n");
return 1;
}
rc = pthread_create (&thr, NULL, fn, NULL);
assert (rc == 0);
rc = pthread_join (thr, NULL);
assert (rc == 0);
/* We create threads to force TLS allocation, which triggers
the original bug i.e. running out of surplus slotinfo entries
for TLS. */
thr = xpthread_create (NULL, fn, NULL);
xpthread_join (thr);
}
return 0;