dynamic log types

[protos/libecoli.git] / lib / ecoli_test.c

diff --git a/lib/ecoli_test.c b/lib/ecoli_test.c
index 070d99b..53cdf62 100644 (file)
--- a/lib/ecoli_test.c
+++ b/lib/ecoli_test.c
@@ -41,6 +41,8 @@
 
 static struct ec_test_list test_list = TAILQ_HEAD_INITIALIZER(test_list);
 
+EC_LOG_TYPE_REGISTER(test);
+
 /* register a driver */
 void ec_test_register(struct ec_test *test)
 {
@@ -76,7 +78,7 @@ int ec_test_check_parse(struct ec_node *tk, int expected, ...)
        p = ec_node_parse_strvec(tk, vec);
        ec_parsed_dump(stdout, p); /* XXX only for debug */
        if (p == NULL) {
-               ec_log(EC_LOG_ERR, "parsed is NULL\n");
+               EC_LOG(EC_LOG_ERR, "parsed is NULL\n");
        }
        if (ec_parsed_matches(p))
                match = ec_parsed_len(p);
@@ -85,7 +87,7 @@ int ec_test_check_parse(struct ec_node *tk, int expected, ...)
        if (expected == match) {
                ret = 0;
        } else {
-               ec_log(EC_LOG_ERR,
+               EC_LOG(EC_LOG_ERR,
                        "tk parsed len (%d) does not match expected (%d)\n",
                        match, expected);
        }
@@ -102,8 +104,7 @@ int ec_test_check_complete(struct ec_node *tk, ...)
 {
        struct ec_completed *c = NULL;
        struct ec_strvec *vec = NULL;
-       const char *expected, *s;
-       char *smallest_start = NULL;
+       const char *s;
        int ret = 0;
        unsigned int count = 0;
        va_list ap;
@@ -148,12 +149,12 @@ int ec_test_check_complete(struct ec_node *tk, ...)
                /* only check matching completions */
                iter = ec_completed_iter(c, EC_MATCH);
                while ((item = ec_completed_iter_next(iter)) != NULL) {
-                       if (item->add != NULL && strcmp(item->add, s) == 0)
+                       if (item->str != NULL && strcmp(item->str, s) == 0)
                                break;
                }
 
                if (item == NULL) {
-                       ec_log(EC_LOG_ERR,
+                       EC_LOG(EC_LOG_ERR,
                                "completion <%s> not in list\n", s);
                        ret = -1;
                }
@@ -162,7 +163,7 @@ int ec_test_check_complete(struct ec_node *tk, ...)
 
        /* check if we have more completions (or less) than expected */
        if (count != ec_completed_count(c, EC_MATCH)) {
-               ec_log(EC_LOG_ERR,
+               EC_LOG(EC_LOG_ERR,
                        "nb_completion (%d) does not match (%d)\n",
                        count, ec_completed_count(c, EC_MATCH));
                ec_completed_dump(stdout, c);
@@ -170,22 +171,9 @@ int ec_test_check_complete(struct ec_node *tk, ...)
        } else
                ec_completed_dump(stdout, c); //XXX
 
-       /* check the expected smallest start */
-       expected = va_arg(ap, const char *);
-       smallest_start = ec_completed_smallest_start(c);
-       if (smallest_start == NULL)
-               goto out;
-       if (strcmp(smallest_start, expected)) {
-               ret = -1;
-               ec_log(EC_LOG_ERR,
-                       "should complete with <%s> but completes with <%s>\n",
-                       expected, s);
-       }
-
 out:
        ec_strvec_free(vec);
        ec_completed_free(c);
-       ec_free(smallest_start);
        va_end(ap);
        return ret;
 }
@@ -200,21 +188,25 @@ static int launch_test(const char *name)
                if (name != NULL && strcmp(name, test->name))
                        continue;
 
-               ec_log(EC_LOG_INFO, "== starting test %-20s\n", test->name);
+               EC_LOG(EC_LOG_INFO, "== starting test %-20s\n",
+                       test->name);
 
                count++;
                if (test->test() == 0) {
-                       ec_log(EC_LOG_INFO, "== test %-20s success\n",
+                       EC_LOG(EC_LOG_INFO,
+                               "== test %-20s success\n",
                                test->name);
                } else {
-                       ec_log(EC_LOG_INFO, "== test %-20s failed\n",
+                       EC_LOG(EC_LOG_INFO,
+                               "== test %-20s failed\n",
                                test->name);
                        ret = -1;
                }
        }
 
        if (name != NULL && count == 0) {
-               ec_log(EC_LOG_WARNING, "== test %s not found\n", name);
+               EC_LOG(EC_LOG_WARNING,
+                       "== test %s not found\n", name);
                ret = -1;
        }