t/unit/: Create one test binary for each *_test.c file.

[sysdb.git] / t / unit / frontend / sock_test.c

diff --git a/t/unit/frontend/sock_test.c b/t/unit/frontend/sock_test.c
index 852a498f3a52e919212753fcc25720f6a0287cb3..14b20907ca9051b680ddd7eec3ee7a05c218f384 100644 (file)
--- a/t/unit/frontend/sock_test.c
+++ b/t/unit/frontend/sock_test.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
 #include "frontend/sock.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
 
 #include <check.h>
 
@@ -67,21 +71,15 @@ teardown(void)
 static void
 sock_listen(char *tmp_file)
 {
-       char sock_addr[strlen("unix:") + L_tmpnam + 1];
-       char *filename;
-
+       char sock_addr[strlen("unix:") + strlen(tmp_file) + 1];
        int check;
 
-       filename = tmpnam(tmp_file);
-       fail_unless(filename != NULL,
-                       "INTERNAL ERROR: tmpnam() = NULL; expected: a string");
-
        sprintf(sock_addr, "unix:%s", tmp_file);
-       check = sdb_fe_sock_add_listener(sock, sock_addr);
+       check = sdb_fe_sock_add_listener(sock, sock_addr, NULL);
        fail_unless(check == 0,
                        "sdb_fe_sock_add_listener(%s) = %i; expected: 0",
                        sock_addr, check);
-} /* conn */
+} /* sock_listen */
 
 /*
  * parallel testing
@@ -108,12 +106,12 @@ START_TEST(test_listen_and_serve)
 {
        sdb_fe_loop_t loop = SDB_FE_LOOP_INIT;
 
-       char tmp_file[L_tmpnam];
+       char tmp_file[] = "sock_test_socket.XXXXXX";
        int check;
 
        pthread_t thr;
 
-       int sock_fd;
+       int fd, sock_fd;
        struct sockaddr_un sa;
 
        check = sdb_fe_sock_listen_and_serve(sock, &loop);
@@ -121,6 +119,9 @@ START_TEST(test_listen_and_serve)
                        "sdb_fe_sock_listen_and_serve() = %i; "
                        "expected: <0 (before adding listeners)", check);
 
+       fd = mkstemp(tmp_file);
+       unlink(tmp_file);
+       close(fd);
        sock_listen(tmp_file);
 
        loop.do_loop = 1;
@@ -167,19 +168,14 @@ START_TEST(test_listen_and_serve)
 }
 END_TEST
 
-Suite *
-fe_sock_suite(void)
+TEST_MAIN("frontend::sock")
 {
-       Suite *s = suite_create("frontend::sock");
-       TCase *tc;
-
-       tc = tcase_create("core");
+       TCase *tc = tcase_create("core");
        tcase_add_checked_fixture(tc, setup, teardown);
        tcase_add_test(tc, test_listen_and_serve);
-       suite_add_tcase(s, tc);
-
-       return s;
-} /* util_unixsock_suite */
+       ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */