X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/d994d4c8bc35514ab5fafff7177cdf6d4e3c61ce..0a1c8a90e23304220f6602e98aba5f891a1350b2:/t/test.h

diff --git a/t/test.h b/t/test.h
index 091ad88..2e7882d 100644
--- a/t/test.h
+++ b/t/test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012, 2020, 2022-2023 Nick Bowler
+ * Copyright © 2012, 2020, 2022-2024 Nick Bowler
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #endif
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 struct cdecl_declspec;
 struct option;
@@ -35,15 +36,23 @@ struct cdecl;
 
 struct test_rng;
 
+void print_error(const char *fmt, ...);
+
 void *malloc_nofail(size_t size);
 void *realloc_nofail(void *ptr, size_t size);
-void test_print_specifiers(struct cdecl_declspec *spec);
-void test_print_decl(struct cdecl *decl);
-void test_explain_decl(struct cdecl *decl);
 
-bool strict_strtoul(unsigned long *val, const char *str, int base);
+bool test_strtoumax(uintmax_t *out, const char *s, uintmax_t limit);
+
+static inline bool test_strtoul(unsigned long *val, const char *str)
+{
+	uintmax_t v;
+	bool rc;
+
+	rc = test_strtoumax(&v, str, (unsigned long)-1);
+	*val = v;
+	return rc;
+}
 
-void test_print_version(const char *program);
 void test_print_options(const struct option *lopts);
 
 /*
@@ -71,4 +80,14 @@ static inline int test_rng_50_50(struct test_rng *rng)
 	return test_rng_uniform_int(rng, 2) == 0;
 }
 
+#define VERSION_NO_COPYRIGHT_SYMBOL 1
+#include "version.h"
+
+#ifdef PROGNAME
+const char *progname = PROGNAME;
+#endif
+
+#define test_print_version(s) \
+	do_print_version(s " (" PACKAGE_NAME ") " PACKAGE_VERSION)
+
 #endif