@@@ tvec doc wip

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

diff --git a/utils/t/versioncmp-test.c b/utils/t/versioncmp-test.c
index 0fb344c1559f7c69738560cb66aa194b7f6b6afe..fb462d04df02893847de01669f2ef343267bf388 100644 (file)
--- a/utils/t/versioncmp-test.c
+++ b/utils/t/versioncmp-test.c
@@ -35,7 +35,7 @@ enum {
 
 static void test_versioncmp(const struct tvec_reg *in, struct tvec_reg *out,
                            void *ctx)
-  { out[RRC].v.i = versioncmp(in[RV0].v.str.p, in[RV1].v.str.p); }
+  { out[RRC].v.i = versioncmp(in[RV0].v.text.p, in[RV1].v.text.p); }
 
 static void swap_test(struct tvec_state *tv, tvec_testfn *fn, void *ctx)
 {
@@ -49,23 +49,22 @@ static void swap_test(struct tvec_state *tv, tvec_testfn *fn, void *ctx)
 }
 static const struct tvec_env swap_testenv = { 0, 0, 0, 0, swap_test, 0, 0 };
 
-static const struct tvec_irange cmp_range = { -1, +1 };
 static const struct tvec_regdef versioncmp_regs[] = {
-  { "v0", RV0, &tvty_string, 0 },
-  { "v1", RV1, &tvty_string, 0 },
-  { "rc", RRC, &tvty_int, 0, { &cmp_range } },
-  { 0, 0, 0, 0 }
+  { "v0", RV0, &tvty_text, 0 },
+  { "v1", RV1, &tvty_text, 0 },
+  { "rc", RRC, &tvty_ienum, 0, { &tvenum_cmp } },
+  TVEC_ENDREGS
 };
 
 static const struct tvec_test tests[] = {
   { "versioncmp", versioncmp_regs, &swap_testenv, test_versioncmp },
-  { 0, 0, 0, 0 }
+  TVEC_ENDTESTS
 };
 
-static const struct tvec_info testinfo =
+static const struct tvec_config testconfig =
   { tests, NROUT, NREG, sizeof(struct tvec_reg) };
 
 int main(int argc, char *argv[])
-  { return (tvec_main(argc, argv, &testinfo, 0)); }
+  { return (tvec_main(argc, argv, &testconfig, 0)); }
 
 /*----- That's all, folks -------------------------------------------------*/