Restructure build system into multiple directories.

impl · impl · commit b1a69b977a1a · 2013-04-11T15:26:36.000Z
This additionally adds a unit test for #1.
diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,6 @@
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
 /missing
-/t/test_*
-!/t/test_*.*
 
 .deps/
 .dirstamp
diff --git a/Makefile.am b/Makefile.am
@@ -1,44 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-lib_LTLIBRARIES = libcurvecpr.la
-
-libcurvecpr_la_CPPFLAGS = -I$(top_srcdir)/include
-libcurvecpr_la_LDFLAGS = -version-info $(CURVECPR_LIBRARY_VERSION)
-
-libcurvecpr_la_SOURCES = \
-    lib/bytes.c \
-    lib/chicago.c \
-    lib/client.c \
-    lib/client_recv.c \
-    lib/client_send.c \
-    lib/messager.c \
-    lib/server.c \
-    lib/server_recv.c \
-    lib/server_send.c \
-    lib/session.c \
-    lib/util.c
-
-curvecprincludedir = $(includedir)/curvecpr
-curvecprinclude_HEADERS = \
-    include/block.h \
-    include/bytes.h \
-    include/chicago.h \
-    include/client.h \
-    include/messager.h \
-    include/packet.h \
-    include/server.h \
-    include/session.h \
-    include/util.h
-
-check_PROGRAMS =
-
-check_PROGRAMS += t/test_messager
-t_test_messager_SOURCES = t/test_messager.c
-t_test_messager_CPPFLAGS = -I$(top_srcdir)/include
-t_test_messager_CFLAGS = @CHECK_CFLAGS@
-t_test_messager_LDADD = $(top_builddir)/libcurvecpr.la @CHECK_LIBS@
-
-TESTS = $(check_PROGRAMS)
+SUBDIRS = include lib t
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcurvecpr.pc
diff --git a/configure.ac b/configure.ac
@@ -61,5 +61,11 @@ AX_APPEND_COMPILE_FLAGS([ dnl
 AX_APPEND_LINK_FLAGS([-Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack], [], [$CCHECKFLAGS])
 
 # Done!
-AC_CONFIG_FILES([Makefile libcurvecpr.pc])
+AC_CONFIG_FILES([
+    Makefile
+    include/Makefile
+    lib/Makefile
+    t/Makefile
+    libcurvecpr.pc
+])
 AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -0,0 +1,11 @@
+curvecprincludedir = $(includedir)/curvecpr
+curvecprinclude_HEADERS = \
+    block.h \
+    bytes.h \
+    chicago.h \
+    client.h \
+    messager.h \
+    packet.h \
+    server.h \
+    session.h \
+    util.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -0,0 +1,16 @@
+lib_LTLIBRARIES = libcurvecpr.la
+
+libcurvecpr_la_CPPFLAGS = -I$(top_srcdir)/include
+libcurvecpr_la_LDFLAGS = -version-info $(CURVECPR_LIBRARY_VERSION)
+libcurvecpr_la_SOURCES = \
+    bytes.c \
+    chicago.c \
+    client.c \
+    client_recv.c \
+    client_send.c \
+    messager.c \
+    server.c \
+    server_recv.c \
+    server_send.c \
+    session.c \
+    util.c
diff --git a/t/Makefile.am b/t/Makefile.am
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/t
+AM_CFLAGS = @CHECK_CFLAGS@
+LDADD = $(top_builddir)/lib/libcurvecpr.la @CHECK_LIBS@
+
+check_PROGRAMS =
+
+check_PROGRAMS += messager/test_new_configures_object
+messager_test_new_configures_object_SOURCES = messager/test_new_configures_object.c
+
+check_PROGRAMS += messager/test_recv_requests_removal_from_sendmarkq
+messager_test_recv_requests_removal_from_sendmarkq_SOURCES = messager/test_recv_requests_removal_from_sendmarkq.c
+
+check_PROGRAMS += messager/test_send_with_1_failure_moves_message_from_sendq
+messager_test_send_with_1_failure_moves_message_from_sendq_SOURCES = messager/test_send_with_1_failure_moves_message_from_sendq.c
+
+TESTS = $(check_PROGRAMS)
diff --git a/t/check_extras.h b/t/check_extras.h
@@ -0,0 +1,20 @@
+#include <check.h>
+
+#ifndef RUN_TEST
+#define RUN_TEST(fn)                            \
+    int main (void)                             \
+    {                                           \
+        Suite *s = suite_create(#fn);           \
+                                                \
+        TCase *tc = tcase_create(#fn);          \
+        tcase_add_test(tc, (fn));               \
+        suite_add_tcase(s, tc);                 \
+                                                \
+        SRunner *sr = srunner_create(s);        \
+        srunner_run_all(sr, CK_NORMAL);         \
+        int failed = srunner_ntests_failed(sr); \
+        srunner_free(sr);                       \
+                                                \
+        return failed ? 1 : 0;                  \
+    }
+#endif
diff --git a/t/messager/.gitignore b/t/messager/.gitignore
@@ -0,0 +1,3 @@
+/test_new_configures_object
+/test_recv_requests_removal_from_sendmarkq
+/test_send_with_1_failure_moves_message_from_sendq
diff --git a/t/messager/test_new_configures_object.c b/t/messager/test_new_configures_object.c
@@ -0,0 +1,20 @@
+#include <check.h>
+#include <check_extras.h>
+
+#include "messager.h"
+
+static char static_priv[] = "Hello!";
+
+START_TEST (test_new_configures_object)
+{
+    struct curvecpr_messager messager;
+    struct curvecpr_messager_cf cf = { .priv = static_priv };
+
+    curvecpr_messager_new(&messager, &cf, 1);
+
+    fail_unless(memcmp(static_priv, messager.cf.priv, sizeof(static_priv)) == 0);
+    fail_unless(messager.my_maximum_send_bytes == 512);
+}
+END_TEST
+
+RUN_TEST (test_new_configures_object)
diff --git a/t/messager/test_recv_requests_removal_from_sendmarkq.c b/t/messager/test_recv_requests_removal_from_sendmarkq.c
@@ -0,0 +1,33 @@
+#include <check.h>
+#include <check_extras.h>
+
+#include "bytes.h"
+#include "messager.h"
+
+static int t_sendmarkq_remove_range (struct curvecpr_messager *messager, unsigned long long start, unsigned long long end)
+{
+    fail_unless(start == 0);
+    fail_unless(end == 1234);
+
+    return 0;
+}
+
+START_TEST (test_recv_requests_removal_from_sendmarkq)
+{
+    struct curvecpr_messager messager;
+    struct curvecpr_messager_cf cf = {
+        .ops = {
+            .sendmarkq_remove_range = t_sendmarkq_remove_range
+        }
+    };
+    unsigned char buf[1024] = { 0 };
+    size_t len = 128;
+
+    curvecpr_bytes_pack_uint64(buf + 8, 1234L);
+
+    curvecpr_messager_new(&messager, &cf, 1);
+    curvecpr_messager_recv(&messager, buf, len);
+}
+END_TEST
+
+RUN_TEST (test_recv_requests_removal_from_sendmarkq)
diff --git a/t/messager/test_send_with_1_failure_moves_message_from_sendq.c b/t/messager/test_send_with_1_failure_moves_message_from_sendq.c
@@ -0,0 +1,91 @@
+#include <check.h>
+#include <check_extras.h>
+
+#include "messager.h"
+
+static struct curvecpr_block static_block = {
+    .id = 0,
+    .clock = 0,
+    .eof = CURVECPR_BLOCK_STREAM,
+    .data_len = 7,
+    .data = "Hello!"
+};
+
+static unsigned char t_q_is_full (struct curvecpr_messager *messager)
+{
+    return 0;
+}
+
+static int t_recvmarkq_get (struct curvecpr_messager *messager, unsigned int n, struct curvecpr_block **block_stored)
+{
+    return 1;
+}
+
+static int t_sendmarkq_head (struct curvecpr_messager *messager, struct curvecpr_block **block_stored)
+{
+    return 1;
+}
+
+static int t_sendq_head (struct curvecpr_messager *messager, struct curvecpr_block **block_stored)
+{
+    int *send_counter = (int *) messager->cf.priv;
+    if (*send_counter < 2) {
+        *block_stored = &static_block;
+        return 0;
+    }
+
+    return 1;
+}
+
+static int t_send (struct curvecpr_messager *messager, const unsigned char *buf, size_t num)
+{
+    return 0;
+}
+
+static int t_sendq_move_to_sendmarkq (struct curvecpr_messager *messager, const struct curvecpr_block *block, struct curvecpr_block **block_stored)
+{
+    int *send_counter = (int *) messager->cf.priv;
+    (*send_counter)++;
+
+    if (*send_counter < 2) {
+        return 1;
+    } else {
+        *send_counter = -1;
+        return 0;
+    }
+}
+
+START_TEST (test_send_with_1_failure_moves_message_from_sendq)
+{
+    int send_counter = 0;
+
+    struct curvecpr_messager messager;
+    struct curvecpr_messager_cf cf = {
+        .ops = {
+            .sendmarkq_is_full = t_q_is_full,
+            .recvmarkq_is_full = t_q_is_full,
+            .recvmarkq_get = t_recvmarkq_get,
+            .sendmarkq_head = t_sendmarkq_head,
+            .sendq_head = t_sendq_head,
+            .send = t_send,
+            .sendq_move_to_sendmarkq = t_sendq_move_to_sendmarkq
+        },
+        .priv = &send_counter
+    };
+
+    curvecpr_messager_new(&messager, &cf, 1);
+
+    /* Try sending once. */
+    curvecpr_messager_process_sendq(&messager);
+
+    fail_unless(send_counter == 1);
+    messager.my_sent_clock = 0;
+
+    /* Try sending again. */
+    curvecpr_messager_process_sendq(&messager);
+
+    fail_unless(send_counter == -1);
+}
+END_TEST
+
+RUN_TEST (test_send_with_1_failure_moves_message_from_sendq)
diff --git a/t/test_messager.c b/t/test_messager.c

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/test_new_configures_object`
	`2`	`+/test_recv_requests_removal_from_sendmarkq`
	`3`	`+/test_send_with_1_failure_moves_message_from_sendq`