@@@ wip

[mLib] / utils / t / control-test.c

diff --git a/utils/t/control-test.c b/utils/t/control-test.c
index 772ddd29a03fdcf6361e931d39ca22e96e11dcc9..b2fd2c70e2524866e8d29dc66eba7f613cb6f584 100644 (file)
--- a/utils/t/control-test.c
+++ b/utils/t/control-test.c
@@ -41,9 +41,9 @@ static struct tvec_state tvstate;
 static int step;
 
 #define TESTGROUP(name)                                                        \
 static int step;
 
 #define TESTGROUP(name)                                                        \

-       TVEC_TESTGROUP(tg, &tvstate, name)                              \
+       TVEC_TESTGROUP_TAG(grp, &tvstate, name)                         \

        MC_BEFORE(init, { step = 0; })
        MC_BEFORE(init, { step = 0; })

-#define TEST TVEC_TEST(test, &tvstate)
+#define TEST TVEC_TEST_TAG(test, &tvstate)

 #define STEP(s) do {                                                   \
          tvec_claim(&tvstate, s == step, __FILE__, __LINE__,           \
                     "found %d /= expected %d", s, step);               \
 #define STEP(s) do {                                                   \
          tvec_claim(&tvstate, s == step, __FILE__, __LINE__,           \
                     "found %d /= expected %d", s, step);               \


@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
   int argpos;
   int i;
 
   int argpos;
   int i;
 

-  tvec_parseargs(argc, argv, &tvstate, &argpos, &tvec_adhocinfo);
+  tvec_parseargs(argc, argv, &tvstate, &argpos, &tvec_adhocconfig);

   if (argpos < argc) die(2, "no input files expected");
   tvec_adhoc(&tvstate, &test);
 
   if (argpos < argc) die(2, "no input files expected");
   tvec_adhoc(&tvstate, &test);