[1/2] Use write_message instead of write
Commit Message
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.
2016-10-28 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.
---
nptl/tst-kill3.c | 13 +++++++------
nptl/tst-kill6.c | 15 ++++++++-------
nptl/tst-tls2.c | 15 ++++++++-------
nptl/tst-tls3.c | 13 +++++++------
4 files changed, 30 insertions(+), 26 deletions(-)
Comments
On 11/01/2016 01:43 AM, Gabriel F. T. Gomes wrote:
> 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.
>
> 2016-10-28 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.
Looks good to me.
Thanks,
Florian
On Mon, 7 Nov 2016 18:33:25 +0100
Florian Weimer <fweimer@redhat.com> wrote:
> On 11/01/2016 01:43 AM, Gabriel F. T. Gomes wrote:
> > 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.
> >
> > 2016-10-28 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.
>
> Looks good to me.
Thanks. Pushed as d5b38790.
@@ -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"
@@ -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"
@@ -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"
@@ -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"