@@@ much mess, mostly manpages

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

diff --git a/utils/t/versioncmp-test.c b/utils/t/versioncmp-test.c
index 1368e00aa7170d3c1f614e647523cb79983a219d..c9090a3899908269e6b5ff6b809882f6cd0b9c3f 100644 (file)
--- a/utils/t/versioncmp-test.c
+++ b/utils/t/versioncmp-test.c
@@ -35,37 +35,36 @@ enum {
 
 static void test_versioncmp(const struct tvec_reg *in, struct tvec_reg *out,
                            void *ctx)
 
 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 int swap_test(struct tvec_state *tv)
+static void swap_test(struct tvec_state *tv, tvec_testfn *fn, void *ctx)

 {
   struct tvec_reg rt;
 
 {
   struct tvec_reg rt;
 

-  tv->st = '.';
-  tv->test->fn(tv->in, tv->out, 0); tvec_check(tv, "vanilla");
+  fn(tv->in, tv->out, 0); tvec_check(tv, "vanilla");
+  tvec_resetoutputs(tv);

   rt = tv->in[RV0]; tv->in[RV0] = tv->in[RV1]; tv->in[RV1] = rt;
   tv->in[RRC].v.i = -tv->in[RRC].v.i;
   rt = tv->in[RV0]; tv->in[RV0] = tv->in[RV1]; tv->in[RV1] = rt;
   tv->in[RRC].v.i = -tv->in[RRC].v.i;

-  tv->test->fn(tv->in, tv->out, 0); tvec_check(tv, "swapped");
-  return (0);
+  fn(tv->in, tv->out, 0); tvec_check(tv, "swapped");

 }
 }

+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[] = {
 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 }
+  { "v0",      &tvty_text,     RV0,    0 },
+  { "v1",      &tvty_text,     RV1,    0 },
+  { "rc",      &tvty_ienum,    RRC,    0,              { &tvenum_cmp } },
+  TVEC_ENDREGS

 };
 
 static const struct tvec_test tests[] = {
 };
 
 static const struct tvec_test tests[] = {

-  { "versioncmp", versioncmp_regs, 0, swap_test, test_versioncmp },
-  { 0, 0, 0, 0 }
+  { "versioncmp", versioncmp_regs, &swap_testenv, test_versioncmp },
+  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[])
   { 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 -------------------------------------------------*/
 
 /*----- That's all, folks -------------------------------------------------*/