X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftstnmem.c;h=4d51ed70e83df1961c0a79482322bcc9b8bcd96d;hb=0725af5d06bfcdaf9888886f04c63810c1d8cf72;hp=54048c812fe18ff9ee516a42cd2b597fb37eb447;hpb=7bfa924f0f58b494c4aba33320183374ffd594cd;p=yaz-moved-to-github.git

diff --git a/test/tstnmem.c b/test/tstnmem.c
index 54048c8..4d51ed7 100644
--- a/test/tstnmem.c
+++ b/test/tstnmem.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2002-2004, Index Data
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstnmem.c,v 1.2 2004-09-29 20:15:48 adam Exp $
+ * $Id: tstnmem.c,v 1.8 2007-04-17 20:26:18 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -15,31 +15,50 @@
 #include <ctype.h>
 
 #include <yaz/nmem.h>
+#include <yaz/test.h>
 
-int main (int argc, char **argv)
+void tst(void)
 {
-    void *cp;
     NMEM n;
     int j;
+    char *cp;
 
-    nmem_init();
     n = nmem_create();
-    if (!n)
-        exit (1);
+    YAZ_CHECK(n);
+
     for (j = 1; j<500; j++)
     {
         cp = nmem_malloc(n, j);
-        if (!cp)
-            exit(2);
+        YAZ_CHECK(cp);
+        if (sizeof(long) >= j)
+            *(long*) cp = 123L;
+#if HAVE_LONG_LONG
+        if (sizeof(long long) >= j)
+            *(long long*) cp = 123L;
+#endif
+        if (sizeof(double) >= j)
+            *(double*) cp = 12.2;
     }
     
     for (j = 2000; j<20000; j+= 2000)
     {
         cp = nmem_malloc(n, j);
-        if (!cp)
-            exit(3);
+        YAZ_CHECK(cp);
     }
     nmem_destroy(n);
-    nmem_exit();
-    exit(0);
 }
+
+int main (int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+    tst();
+    YAZ_CHECK_TERM;
+}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+