X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/b64eb60f6c1fdb12f3922e04913e137199838807..c81c35dfd10050ffef85d57dc2ad73f52f38a3f2:/utils/t/control-test.c

diff --git a/utils/t/control-test.c b/utils/t/control-test.c
index 772ddd2..44c4d2f 100644
--- 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)							\
-	TVEC_TESTGROUP(tg, &tvstate, name)				\
+	TVEC_TESTGROUP_TAG(grp, &tvstate, name)				\
 	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);		\
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
   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);
 
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
     FOR_FIZZBUZZ(fb, 19, 32)
       TEST
 	if (TVEC_CLAIM(&tvstate, ref[i]))
-	  { TVEC_CLAIMEQ_STRZ(&tvstate, fb, ref[i]); i++; }
+	  { TVEC_CLAIMEQ_TEXTZ(&tvstate, fb, ref[i]); i++; }
     TVEC_CLAIM(&tvstate, !ref[i]);
   }