Refactor evtag tests into their own suite.

svn:r1366

diff --git a/test/regress.c b/test/regress.c
index 64903b3e7eed14f1d06e1847a0155ce5caeb11a7..8bc5d7569eaaa5cf1f0b5fa5d0370d2e40d28f5c 100644 (file)
--- a/test/regress.c
+++ b/test/regress.c
@@ -1320,7 +1320,7 @@ test_want_only_once(void)
 #define TEST_MAX_INT   6
 
 static void
-evtag_int_test(void)
+evtag_int_test(void *ptr)
 {
        struct evbuffer *tmp = evbuffer_new();
        ev_uint32_t integers[TEST_MAX_INT] = {
@@ -1330,6 +1330,8 @@ evtag_int_test(void)
        ev_uint64_t big_int;
        int i;
 
+       evtag_init();
+
        for (i = 0; i < TEST_MAX_INT; i++) {
                int oldlen, newlen;
                oldlen = EVBUFFER_LENGTH(tmp);
@@ -1349,14 +1351,13 @@ evtag_int_test(void)
                tt_assert((big_int / 1000000000) == integers[i]);
        }
 
-        tt_uint_op(EVBUFFER_LENGTH(tmp), ==, 0);
-
+       tt_uint_op(EVBUFFER_LENGTH(tmp), ==, 0);
 end:
        evbuffer_free(tmp);
 }
 
 static void
-evtag_fuzz(void)
+evtag_fuzz(void *ptr)
 {
        u_char buffer[4096];
        struct evbuffer *tmp = evbuffer_new();
@@ -1364,6 +1365,9 @@ evtag_fuzz(void)
        int i, j;
 
        int not_failed = 0;
+
+       evtag_init();
+
        for (j = 0; j < 100; j++) {
                for (i = 0; i < sizeof(buffer); i++)
                        buffer[i] = rand();
@@ -1394,7 +1398,7 @@ end:
 }
 
 static void
-evtag_tag_encoding(void)
+evtag_tag_encoding(void *ptr)
 {
        struct evbuffer *tmp = evbuffer_new();
        ev_uint32_t integers[TEST_MAX_INT] = {
@@ -1403,6 +1407,8 @@ evtag_tag_encoding(void)
        ev_uint32_t integer;
        int i;
 
+       evtag_init();
+
        for (i = 0; i < TEST_MAX_INT; i++) {
                int oldlen, newlen;
                oldlen = EVBUFFER_LENGTH(tmp);
@@ -1418,19 +1424,11 @@ evtag_tag_encoding(void)
        }
 
         tt_uint_op(EVBUFFER_LENGTH(tmp), ==, 0);
+
 end:
        evbuffer_free(tmp);
 }
 
-static void
-test_evtag(void)
-{
-       evtag_init();
-       evtag_int_test();
-       evtag_fuzz();
-       evtag_tag_encoding();
-        test_ok = 1;
-}
 
 static void
 test_methods(void *ptr)
@@ -1787,10 +1785,15 @@ struct testcase_t main_testcases[] = {
 #ifndef WIN32
         LEGACY(fork, TT_ISOLATED),
 #endif
+        END_OF_TESTCASES
+};
 
-        LEGACY(evtag, TT_ISOLATED),
+struct testcase_t evtag_testcases[] = {
+       { "int", evtag_int_test, TT_FORK, NULL, NULL },
+       { "fuzz", evtag_fuzz, TT_FORK, NULL, NULL },
+       { "encoding", evtag_tag_encoding, TT_FORK, NULL, NULL },
 
-        END_OF_TESTCASES
+       END_OF_TESTCASES
 };
 
 struct testcase_t signal_testcases[] = {

diff --git a/test/regress.h b/test/regress.h
index 3365fcbb41d68e6de56b49c0c250cd961b51b7c4..b8724c01acd0c08755bad40792f0f997b236d76b 100644 (file)
--- a/test/regress.h
+++ b/test/regress.h
@@ -35,6 +35,7 @@ extern "C" {
 #include "tinytest_macros.h"
 
 extern struct testcase_t main_testcases[];
+extern struct testcase_t evtag_testcases[];
 extern struct testcase_t evbuffer_testcases[];
 extern struct testcase_t bufferevent_testcases[];
 extern struct testcase_t util_testcases[];

diff --git a/test/regress_main.c b/test/regress_main.c
index 9ed62cf801ba2fd708e72f7b13e11d43d41712bb..e16c7d6a56880deb40f53c182a2ce97ba16c61e0 100644 (file)
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -283,6 +283,7 @@ struct testgroup_t testgroups[] = {
        { "bufferevent/", bufferevent_testcases },
        { "http/", http_testcases },
        { "dns/", dns_testcases },
+       { "evtag/", evtag_testcases },
        { "rpc/", rpc_testcases },
        { "thread/", thread_testcases },
 #ifdef WIN32