tests: Avoid dependency on strtoumax.

[cdecl99.git] / t / test.h

diff --git a/t/test.h b/t/test.h
index 091ad88b8b322ab80629048edbe307bf16cea692..a6382e2918d44e59b152565da010ae13f58a95ec 100644 (file)
--- a/t/test.h
+++ b/t/test.h
@@ -37,13 +37,19 @@ struct test_rng;
 
 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 +77,10 @@ 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"
+
+#define test_print_version(s) \
+       do_print_version(s " (" PACKAGE_NAME ") " PACKAGE_VERSION)
+
 #endif