general: update the semaphore test

diff --git a/src/general/sem.c b/src/general/sem.c
index 77d6796..329164a 100644 (file)
--- a/src/general/sem.c
+++ b/src/general/sem.c
@@ -1,25 +1,17 @@
-#include <pthread.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <semaphore.h>
 #include <time.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include "test.h"
 
-#define TEST(r, f, x, m) ( \
-       ((r) = (f)) == (x) || \
-       (error("%s failed (" m ")\n", #f, r, x), 0) )
-
-#define TEST_S(s, x, m) ( \
-       !strcmp((s),(x)) || \
-       (error("[%s] != [%s] (%s)\n", s, x, m), 0) )
+#define TEST(c, ...) \
+       ( (c) || (error(#c " failed: " __VA_ARGS__),0) )
 
 int main(void)
 {
-       int r;
        char buf[100];
        struct timespec ts;
        sem_t *sem, *sem2;
@@ -28,24 +20,31 @@ int main(void)
        clock_gettime(CLOCK_REALTIME, &ts);
        snprintf(buf, sizeof buf, "/testsuite-%d-%d", (int)getpid(), (int)ts.tv_nsec);
 
-       TEST(r, !(sem=sem_open(buf, O_CREAT|O_EXCL, 0700, 1)), 0, "could not open sem");
+       TEST((sem=sem_open(buf, O_CREAT|O_EXCL, 0700, 1)) != SEM_FAILED,
+               "could not open sem: %s\n", strerror(errno));
+       errno = 0;
+       TEST(sem_open(buf, O_CREAT|O_EXCL, 0700, 1) == SEM_FAILED,
+               "reopening should fail with O_EXCL\n");
+       TEST(errno == EEXIST,
+               "after reopen failure errno is \"%s\" (%d); want EEXIST (%d)\n", strerror(errno), errno, EEXIST);
+       errno = 0;
 
-       TEST(r, sem_getvalue(sem, &val), 0, "failed to get sem value");
-       TEST(r, val, 1, "wrong initial semaphore value");
+       TEST(sem_getvalue(sem, &val) == 0, "failed to get sem value\n");
+       TEST(val == 1, "wrong initial semaphore value: %d\n", val);
 
-       TEST(r, !(sem2=sem_open(buf, 0)), 0, "could not reopen sem");
-       TEST(r, sem!=sem2, 0, "reopened sem has different address");
+       TEST((sem2=sem_open(buf, 0)) == sem,
+               "could not reopen sem: got %p, want %p\n", sem2, sem);
 
-       TEST(r, sem_wait(sem), 0, "failed on sem wait");
-       TEST(r, sem_getvalue(sem2, &val), 0, "failed to get sem value");
-       TEST(r, val, 0, "wrong semaphore value on second handle");
+       TEST(sem_wait(sem) == 0, "%s\n", strerror(errno));
+       TEST(sem_getvalue(sem2, &val) == 0, "%s\n", strerror(errno));
+       TEST(val == 0, "wrong semaphore value on second handle: %d\n", val);
 
-       TEST(r, sem_post(sem), 0, "failed on sem post");
-       TEST(r, sem_getvalue(sem2, &val), 0, "failed to get sem value");
-       TEST(r, val, 1, "wrong semaphore value on second handle");
+       TEST(sem_post(sem) == 0, "%s\n", strerror(errno));
+       TEST(sem_getvalue(sem2, &val) == 0, "%s\n", strerror(errno));
+       TEST(val == 1, "wrong semaphore value on second handle: %d\n", val);
 
-       TEST(r, sem_close(sem), 0, "failed to close sem");
-       TEST(r, sem_close(sem), 0, "failed to close sem second time");
-       TEST(r, sem_unlink(buf), 0, "failed to unlink sem");
+       TEST(sem_close(sem) == 0, "%s\n", strerror(errno));
+       TEST(sem_close(sem) == 0, "%s\n", strerror(errno));
+       TEST(sem_unlink(buf) == 0, "%s\n", strerror(errno));
        return test_status;
 }