Changeset 2703 for trunk/psLib/test/sysUtils/tst_psMemory.c

Timestamp:

Dec 13, 2004, 10:49:56 AM (22 years ago)

Author:

desonia

Message:

fixed errors caused indirectly from the psList change.

File:

• trunk/psLib/test/sysUtils/tst_psMemory.c (modified) (3 diffs)

trunk/psLib/test/sysUtils/tst_psMemory.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-01 00:55:34 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-13 20:49:56 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
 
 testDescription tests[] = {
-                              {
-                                  TPCheckBufferPositive, 449, "checkBufferPositive", 0, false
-                              },
-                              {
-                                  TPOutOfMemory, 450, "outOfMemory", -6, false
-                              },
-                              {
-                                  TPReallocOutOfMemory, 562, "reallocOutOfMemory", -6, false
-                              },
-                              {
-                                  TPrealloc, 451, "psRealloc", 0, false
-                              },
-                              {
-                                  TPallocCallback, 452, "allocCallback", 0, false
-                              },
-                              {
-                                  TPallocCallback, 453, "allocCallback2", 0, true
-                              },
-                              {
-                                  TPcheckLeaks, 454, "checkLeaks", 0, false
-                              },
-                              {
-                                  TPmemCorruption, 455, "psMemCorruption", 0, false
-                              },
-                              {
-                                  TPFreeReferencedMemory, 456, "freeReferencedMemory", 0, false
-                              },
-                              {
-                                  TPmultipleFree, 699, "multipleFree", 0, false
-                              },
-                              {
-                                  NULL
-                              }
+                              {TPCheckBufferPositive, 449, "checkBufferPositive", 0, false},
+                              {TPOutOfMemory, 450, "outOfMemory", -6, false},
+                              {TPReallocOutOfMemory, 562, "reallocOutOfMemory", -6, false},
+                              {TPrealloc, 451, "psRealloc", 0, false},
+                              {TPallocCallback, 452, "allocCallback", 0, false},
+                              {TPallocCallback, 453, "allocCallback2", 0, true},
+                              {TPcheckLeaks, 454, "checkLeaks", 0, false},
+                              {TPmemCorruption, 455, "psMemCorruption", 0, false},
+                              {TPFreeReferencedMemory, 456, "freeReferencedMemory", 0, false},
+                              {TPmultipleFree, 699, "multipleFree", -6, false},
+                              {NULL}
                           };
 
-psS32 main( psS32 argc, char* argv[] )
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -550 +528 @@
     psFree( buffer );
 
-    psLogMsg( __func__, PS_LOG_INFO, "Next should be an error about multiple freeing." );
+    psLogMsg( __func__, PS_LOG_INFO, "Next should abort due to multiple freeing." );
     psFree( buffer );
 
-    psErr* err = (psErr*)psErrorLast();
-
-    if (err->code != PS_ERR_MEMORY_DEREF_USAGE) {
-        psError(PS_ERR_UNKNOWN,true,
-                "Multiple psFree calls generated wrong error code (%d)",
-                err->code);
-        psFree(err);
-        return 1;
-    }
-
-    psFree(err);
-
-    return 0;
-}
+    psError(PS_ERR_UNKNOWN,true,
+            "Multiple psFree call survived");
+
+    return 0;
+}