X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/0875b58fcccadd756e11487185c2ac1d3ed8ab4d..1dc931965d15b69def7e1fdd44b4397eca01e4c9:/testrig.h

diff --git a/testrig.h b/testrig.h
index c8fa10b..69b2868 100644
--- a/testrig.h
+++ b/testrig.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: testrig.h,v 1.1 1998/06/17 23:44:42 mdw Exp $
+ * $Id: testrig.h,v 1.7 2004/04/08 01:36:13 mdw Exp $
  *
  * Generic test driver
  *
@@ -12,30 +12,23 @@
  * This file is part of the mLib utilities library.
  *
  * mLib is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  * 
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Library General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with mLib; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General Public
+ * License along with mLib; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: testrig.h,v $
- * Revision 1.1  1998/06/17 23:44:42  mdw
- * Initial revision
- *
- */
-
-#ifndef TESTER_H
-#define TESTER_H
+#ifndef MLIB_TESTER_H
+#define MLIB_TESTER_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -45,6 +38,7 @@
 
 #include <stddef.h>
 
+#include "bits.h"
 #include "dstr.h"
 
 /*----- Magical numbers ---------------------------------------------------*/
@@ -64,15 +58,18 @@ typedef struct test_type {
 
 typedef struct test_chunk {
   const char *name;			/* Name of this chunk */
-  int (*test)(dstr dv[]);		/* Test verification function */
-  test_type *f[TEST_FIELDMAX];		/* Field definitions */
+  int (*test)(dstr /*dv*/[]);		/* Test verification function */
+  const test_type *f[TEST_FIELDMAX];	/* Field definitions */
 } test_chunk;
 
 /*----- Predefined data types ---------------------------------------------*/
 
-extern test_type type_hex;
-extern test_type type_string;
-extern test_type type_int;
+extern const test_type type_hex;
+extern const test_type type_string;
+extern const test_type type_int;
+extern const test_type type_long;
+extern const test_type type_ulong;
+extern const test_type type_uint32;
 
 /*----- Functions provided ------------------------------------------------*/