mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use write_message instead of write

Browse Source 
In the test cases, there are writes to stdout which do not check the result
value.  This patch replaces such occurrences with calls to write_message,
which properly deals with the unused result.

Tested for powerpc64le.
This commit is contained in:
Gabriel F. T. Gomes 2016-10-30 23:51:27 -02:00
parent 06b9e94f79
commit d5b3879095
5 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2016-11-07 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
* nptl/tst-kill3.c (handler): Use write_message in place of write.
* nptl/tst-kill6.c (handler): Likewise.
* nptl/tst-tls2.c (CB): Likewise.
* nptl/tst-tls3.c (CB): Likewise.
2016-11-07 Joseph Myers <joseph@codesourcery.com>
* scripts/check-installed-headers.sh: Ignore sys/sysctl.h for x32.

13
nptl/tst-kill3.c
View File

@ -25,6 +25,12 @@
#include <sys/time.h>
static int do_test (void);
#define TIMEOUT 5
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
static pthread_barrier_t b;
@ -33,7 +39,7 @@ static pthread_barrier_t b;
static void
handler (int sig)
{
write (1, "handler called\n", 15);
write_message ("handler called\n");
_exit (1);
}
@ -151,8 +157,3 @@ do_test (void)
return 0;
}
#define TIMEOUT 5
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

15
nptl/tst-kill6.c
View File

@ -25,6 +25,11 @@
#include <unistd.h>
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static pthread_t receiver;
static sem_t sem;
static pthread_barrier_t b;
@ -34,19 +39,19 @@ handler (int sig)
{
if (sig != SIGUSR1)
{
write (STDOUT_FILENO, "wrong signal\n", 13);
write_message ("wrong signal\n");
_exit (1);
}
if (pthread_self () != receiver)
{
write (STDOUT_FILENO, "not the intended receiver\n", 26);
write_message ("not the intended receiver\n");
_exit (1);
}
if (sem_post (&sem) != 0)
{
write (STDOUT_FILENO, "sem_post failed\n", 16);
write_message ("sem_post failed\n");
_exit (1);
}
}
@ -155,7 +160,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

15
nptl/tst-tls2.c
View File

@ -29,13 +29,18 @@
static pthread_t th[N];
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
#define CB(n) \
static void \
cb##n (void) \
{ \
if (th[n] != pthread_self ()) \
{ \
write (STDOUT_FILENO, "wrong callback\n", 15); \
write_message ("wrong callback\n"); \
_exit (1); \
} \
}
@ -67,7 +72,7 @@ handler (int sig)
{
if (sig != THE_SIG)
{
write (STDOUT_FILENO, "wrong signal\n", 13);
write_message ("wrong signal\n");
_exit (1);
}
@ -75,7 +80,7 @@ handler (int sig)
if (sem_post (&s) != 0)
{
write (STDOUT_FILENO, "sem_post failed\n", 16);
write_message ("sem_post failed\n");
_exit (1);
}
}
@ -199,7 +204,3 @@ do_test (void)
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

13
nptl/tst-tls3.c
View File

@ -39,13 +39,19 @@ static long stack_size_in_mb;
static pthread_t th[N];
static int do_test (void);
#define TIMEOUT 5
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
#define CB(n) \
static void \
cb##n (void) \
{ \
if (th[n] != pthread_self ()) \
{ \
write (STDOUT_FILENO, "wrong callback\n", 15); \
write_message ("wrong callback\n"); \
_exit (1); \
} \
}
@ -207,8 +213,3 @@ do_test (void)
return 0;
}
#define TIMEOUT 5
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"