Move main() from libcryb-test to the test program.

Instead of having libcryb-test provide main() and assume that the test program defines t_prepare() and t_cleanup(), have libcryb-test provide a t_main() function which the test program calls with pointers to its prepare and cleanup functions.

include/cryb/test.h

@@ -53,8 +53,10 @@ extern const char *t_progname;
 void t_add_test(t_func *, void *, const char *, ...);
 void t_add_tests(struct t_test *, int);
 
-int t_prepare(int, char **);
-void t_cleanup(void);
+typedef int (*t_prepare_func)(int, char **);
+typedef void (*t_cleanup_func)(void);
+void t_main(t_prepare_func, t_cleanup_func, int, char **)
+	CRYB_NORETURN;
 
 void t_verbose_hex(const uint8_t *, size_t);
 void t_verbose(const char *, ...)

lib/test/t_main.c

@@ -221,8 +221,9 @@ usage(void)
 	exit(1);
 }
 
-int
-main(int argc, char *argv[])
+void
+t_main(t_prepare_func t_prepare, t_cleanup_func t_cleanup,
+    int argc, char *argv[])
 {
 	unsigned int n, pass, fail;
 	size_t nt;
@@ -270,7 +271,8 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	/* prepare the test plan */
-	t_prepare(argc, argv);
+	if (t_prepare != NULL)
+		t_prepare(argc, argv);
 	if (t_plan_len == 0)
 		errx(1, "no plan\n");
 
@@ -281,7 +283,8 @@ main(int argc, char *argv[])
 		t_run_test(t_plan[n], n + 1) ? ++pass : ++fail;
 
 	/* clean up as much as possible before we exit */
-	t_cleanup();
+	if (t_cleanup != NULL)
+		t_cleanup();
 	t_fcloseall();
 	for (n = 0; n < t_plan_len; ++n) {
 		free(t_plan[n]->desc);

t/t__string.c

@@ -271,7 +271,7 @@ t_string_trunc(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	unsigned int i;
@@ -299,7 +299,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_adler.c

@@ -132,7 +132,7 @@ t_adler32(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	unsigned int i, n;
@@ -147,7 +147,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_aes.c

@@ -139,7 +139,7 @@ t_aes_dec(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	unsigned int i, n;
@@ -154,7 +154,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_ctype.c

@@ -95,7 +95,7 @@ T_OC(pfcs)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 
@@ -113,7 +113,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_endian.c

@@ -91,7 +91,7 @@ T_ENC(le, 64)
 #define T_ENC_ADD(e, w)							\
 	t_add_test(t_##e##w##enc, 0, #e #w "enc");
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 
@@ -112,7 +112,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_fletcher.c

@@ -279,7 +279,7 @@ t_fletcher64(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	unsigned int i, n;
@@ -307,7 +307,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_hmac_sha1.c

@@ -157,7 +157,7 @@ t_hmac_sha1_vector(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -171,7 +171,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_hmac_sha224.c

@@ -162,7 +162,7 @@ t_hmac_sha224_vector(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -176,7 +176,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_hmac_sha256.c

@@ -162,7 +162,7 @@ t_hmac_sha256_vector(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -176,7 +176,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_hmac_sha384.c

@@ -172,7 +172,7 @@ t_hmac_sha384_vector(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -186,7 +186,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_hmac_sha512.c

@@ -182,7 +182,7 @@ t_hmac_sha512_vector(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -196,7 +196,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_md2.c

@@ -192,7 +192,7 @@ t_md2_perf(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -229,7 +229,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_md4.c

@@ -208,7 +208,7 @@ t_md4_perf(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -245,7 +245,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_md5.c

@@ -208,7 +208,7 @@ t_md5_perf(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -245,7 +245,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_memset_s.c

@@ -128,7 +128,7 @@ t_memset_s_null(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -142,7 +142,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_mpi.c

@@ -1554,7 +1554,7 @@ t_mpi_sub_b_from_zero(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	unsigned int i;
@@ -1651,9 +1651,16 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
+static void
 t_cleanup(void)
 {
 
 	assert(memcmp(&z, t_zero, sizeof z) == 0);
 }
+
+int
+main(int argc, char *argv[])
+{
+
+	t_main(t_prepare, t_cleanup, argc, argv);
+}

t/t_murmur3_32.c

@@ -195,7 +195,7 @@ t_murmur3_32(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -208,7 +208,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_pearson.c

@@ -92,7 +92,7 @@ t_pearson(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -105,7 +105,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_rc4.c

@@ -1987,7 +1987,7 @@ t_rc4(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	unsigned int i, n;
@@ -2000,7 +2000,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_rfc3986.c

@@ -323,10 +323,12 @@ t_rfc3986(char **desc CRYB_UNUSED, void *arg)
 	return (ret);
 }
 
-/*
- * Generate the test plan
+
+/***************************************************************************
+ * Boilerplate
  */
-int
+
+static int
 t_prepare(int argc, char *argv[])
 {
 	struct t_case *t;
@@ -354,10 +356,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-/*
- * Cleanup
- */
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_rfc4648.c

@@ -299,10 +299,12 @@ t_rfc4648(char **desc CRYB_UNUSED, void *arg)
 	return (1);
 }
 
-/*
- * Generate the test plan
+
+/***************************************************************************
+ * Boilerplate
  */
-int
+
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -315,10 +317,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-/*
- * Cleanup
- */
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_sha1.c

@@ -201,7 +201,7 @@ t_sha1_perf(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -238,7 +238,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_sha224.c

@@ -210,7 +210,7 @@ t_sha224_perf(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -247,7 +247,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_sha256.c

@@ -206,7 +206,7 @@ t_sha256_perf(char **desc, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -243,7 +243,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_sha384.c

@@ -254,7 +254,7 @@ t_sha384_carry(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -292,7 +292,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_sha512.c

@@ -266,7 +266,7 @@ t_sha512_carry(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -304,7 +304,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_strlcat.c

@@ -149,7 +149,7 @@ t_strlcat(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -162,7 +162,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_strlcmp.c

@@ -131,7 +131,7 @@ t_strlcmp(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -144,7 +144,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }

t/t_strlcpy.c

@@ -104,7 +104,7 @@ t_strlcpy(char **desc CRYB_UNUSED, void *arg)
  * Boilerplate
  */
 
-int
+static int
 t_prepare(int argc, char *argv[])
 {
 	int i, n;
@@ -117,7 +117,9 @@ t_prepare(int argc, char *argv[])
 	return (0);
 }
 
-void
-t_cleanup(void)
+int
+main(int argc, char *argv[])
 {
+
+	t_main(t_prepare, NULL, argc, argv);
 }