aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-04-23 12:21:00 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-04-23 12:21:00 +0530
commitbacc75f7be11656387c239831f490155f5fb3700 (patch)
treeaaa087f6bd061466db72ecde2cc43b6f9e4ab8f1
parenta059d359d86130b5fa74e04a978c8523a0293f77 (diff)
downloadglibc-bacc75f7be11656387c239831f490155f5fb3700.tar
glibc-bacc75f7be11656387c239831f490155f5fb3700.tar.gz
glibc-bacc75f7be11656387c239831f490155f5fb3700.tar.bz2
glibc-bacc75f7be11656387c239831f490155f5fb3700.zip
Use test-skeleton.c in tst-sem3 and tst-sem4
-rw-r--r--ChangeLog8
-rw-r--r--nptl/tst-sem3.c31
-rw-r--r--nptl/tst-sem4.c5
3 files changed, 29 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 9319a310a0..a638938fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-23 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * nptl/tst-sem3.c: Use test-skeleton.c
+ (main): Rename to do_test. Use return instead of
+ exit.
+ * nptl/tst-sem4.c: Use test-skeleton.c
+ (main): Rename to do_test.
+
2014-04-22 David S. Miller <davem@davemloft.net>
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
diff --git a/nptl/tst-sem3.c b/nptl/tst-sem3.c
index 9862f430ad..7b75e29e29 100644
--- a/nptl/tst-sem3.c
+++ b/nptl/tst-sem3.c
@@ -28,7 +28,7 @@
int
-main (void)
+do_test (void)
{
size_t ps = sysconf (_SC_PAGESIZE);
char tmpfname[] = "/tmp/tst-sem3.XXXXXX";
@@ -43,7 +43,7 @@ main (void)
if (fd == -1)
{
printf ("cannot open temporary file: %m\n");
- exit (1);
+ return 1;
}
/* Make sure it is always removed. */
@@ -56,14 +56,14 @@ main (void)
if (write (fd, data, ps) != (ssize_t) ps)
{
puts ("short write");
- exit (1);
+ return 1;
}
mem = mmap (NULL, ps, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (mem == MAP_FAILED)
{
printf ("mmap failed: %m\n");
- exit (1);
+ return 1;
}
s = (sem_t *) (((uintptr_t) mem + __alignof (sem_t))
@@ -73,25 +73,25 @@ main (void)
if (sem_init (s, 1, 1) == -1)
{
puts ("init failed");
- exit (1);
+ return 1;
}
if (TEMP_FAILURE_RETRY (sem_wait (s)) == -1)
{
puts ("1st wait failed");
- exit (1);
+ return 1;
}
errno = 0;
if (TEMP_FAILURE_RETRY (sem_trywait (s)) != -1)
{
puts ("trywait succeeded");
- exit (1);
+ return 1;
}
else if (errno != EAGAIN)
{
puts ("trywait didn't return EAGAIN");
- exit (1);
+ return 1;
}
*p = 0;
@@ -101,7 +101,7 @@ main (void)
if (pid == -1)
{
puts ("fork failed");
- exit (1);
+ return 1;
}
else if (pid == 0)
{
@@ -109,13 +109,13 @@ main (void)
if ((*p)++ != 0)
{
puts ("child: *p != 0");
- exit (1);
+ return 1;
}
if (sem_post (s) == -1)
{
puts ("child: 1st post failed");
- exit (1);
+ return 1;
}
puts ("child done");
@@ -125,17 +125,20 @@ main (void)
if (TEMP_FAILURE_RETRY (sem_wait (s)) == -1)
{
printf ("parent: 2nd wait failed: %m\n");
- exit (1);
+ return 1;
}
if (*p != 1)
{
puts ("*p != 1");
- exit (1);
+ return 1;
}
puts ("parent done");
}
- exit (0);
+ return 0;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/nptl/tst-sem4.c b/nptl/tst-sem4.c
index b3bac53c77..72ed97d370 100644
--- a/nptl/tst-sem4.c
+++ b/nptl/tst-sem4.c
@@ -32,7 +32,7 @@ remove_sem (int status, void *arg)
int
-main (void)
+do_test (void)
{
sem_t *s;
sem_t *s2;
@@ -144,3 +144,6 @@ main (void)
return 0;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"