Index: trunk/psLib/test/FullUnitTest
===================================================================
--- trunk/psLib/test/FullUnitTest	(revision 3125)
+++ trunk/psLib/test/FullUnitTest	(revision 3127)
@@ -19,6 +19,6 @@
 #  RETURN : integer number of tests which failed
 #
-#  $Revision: 1.16 $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-03 00:54:12 $
+#  $Revision: 1.17 $  $Name: not supported by cvs2svn $
+#  $Date: 2005-02-04 22:49:37 $
 #
 #  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -659,5 +659,5 @@
         s/$hostname\s*/<HOST>/g;
         s/: Line \d+/: Line <LINENO>/g;
-        s/\:\d+/\:<LINENO>/g;
+        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
         s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -687,5 +687,5 @@
         s/$hostname\s*/<HOST>/g;
         s/: Line \d+/: Line <LINENO>/g;
-        s/\:\d+/\:<LINENO>/g;
+        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
         s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
Index: trunk/psLib/test/astronomy/Makefile.am
===================================================================
--- trunk/psLib/test/astronomy/Makefile.am	(revision 3125)
+++ trunk/psLib/test/astronomy/Makefile.am	(revision 3127)
@@ -11,6 +11,5 @@
 	$(all_includes)
 
-PSLIB_LIBS = `sh $(top_srcdir)/pslib-config --libs`
-AM_LDFLAGS = $(PSLIB_LIBS) -L$(top_srcdir)/src 
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = tst_psTime_01 \
@@ -30,5 +29,6 @@
          tst_psAstrometry01
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
+ 
 TESTS = tst_psTime_01 \
          tst_psTime_02 \
@@ -66,4 +66,10 @@
 BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
 
+EXTRA_DIST = test.psTime.config1.template \
+	test.psTime.config2.template \
+	test.psTime.config3.template \
+	test.psTime.config4.template \
+	verified
+
 test.psTime.config1: test.psTime.config1.template
 	sed 's|PREFIX|$(prefix)|' $? > $@
Index: trunk/psLib/test/astronomy/verified/tst_psCoord.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psCoord.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psCoord.stderr	(revision 3127)
@@ -14,7 +14,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
     Error: n1 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
     Error: n2 is less than 0.
 
@@ -27,11 +27,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n1 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n2 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n3 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n4 is less than 0.
 
@@ -44,11 +44,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: transform->x is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: transform->y is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: coords is NULL.
 
@@ -61,11 +61,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: transform->x is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: transform->y is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: coords is NULL.
 
@@ -78,7 +78,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
     Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|E|psSphereTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
     Unallowable operation: coord is NULL.
 
@@ -100,5 +100,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (FILE:LINENO)
     Unallowable operation: time is NULL.
 
@@ -111,5 +111,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (FILE:LINENO)
     Unallowable operation: time is NULL.
 
@@ -140,11 +140,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Unallowable operation: position1 is NULL.
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Unallowable operation: position2 is NULL.
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Specified offset mode, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Specified units, 0x54321, is not supported.
 
@@ -157,11 +157,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Unallowable operation: position is NULL.
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Unallowable operation: offset is NULL.
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Specified offset mode, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Specified units, 0x54321, is not supported.
 
Index: trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 3127)
@@ -1,42 +1,42 @@
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to read a metadata value on line 96 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Metadata type '99.999', found on line 102 of test.config, is not invalid.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '*' character not allowed.  Found on line 108 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '@' character not allowed.  Found on line 114 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '~' character not allowed.  Found on line 120 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to read a metadata value on line 96 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Metadata type '99.999', found on line 102 of test.config, is not invalid.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '*' character not allowed.  Found on line 108 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '@' character not allowed.  Found on line 114 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '~' character not allowed.  Found on line 120 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Duplicate Metadata item, speed, found on line 128 of test.config.  Overwrite not allowed.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to read a metadata value on line 96 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Metadata type '99.999', found on line 102 of test.config, is not invalid.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '*' character not allowed.  Found on line 108 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '@' character not allowed.  Found on line 114 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '~' character not allowed.  Found on line 120 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Unallowable operation: fileName is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to open file 'abcedfg'. Check if it exists and it has the proper permissions.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 3127)
@@ -1,18 +1,18 @@
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified data item is not found in the psList.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Failed to remove metadata item, HISTORY, from metadata list.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Unallowable operation: fileName is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     FITS error while locating header AARGH: illegal HDU number
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3127)
@@ -1,10 +1,10 @@
 <DATE><TIME>|<HOST>|I|main
     Following should produce error for null name.
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
     Unallowable operation: name is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
     Specified psMetadataType, 11, is not supported.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: metadataItem is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 3127)
@@ -1,20 +1,20 @@
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Could not find metadata item, AARGH.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Could not find metadata item at index 22.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->list is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Unallowable operation: md->list is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: metadataItem->name is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAdd (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAdd (FILE:LINENO)
     Failed to add metadata item to metadata collection list.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 3127)
@@ -1,16 +1,16 @@
-<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
     Unallowable operation: key is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, 22, is invalid.
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified location, 22, is invalid.
-<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Could not find metadata item at index 22.
-<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Unallowable operation: md->list is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
     Unallowable operation: fd is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
     Unallowable operation: format is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
     Unallowable operation: metadataItem is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 3127)
@@ -1,14 +1,14 @@
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_mon, 99, is out of range.  Must be between 1 and 12.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_mday, 99, is out of range.  Must be between 1 and 31.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_hour, 99, is out of range.  Must be between 0 and 23.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_min, 99, is out of range.  Must be between 0 and 59.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_sec, 99, is out of range.  Must be between 0 and 59.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: millisecond, -999, is out of range.  Must be between 0 and 999.
-<DATE><TIME>|<HOST>|E|psTimeFromTimeval (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromTimeval (FILE:LINENO)
     Unallowable operation: time is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|main
     Invalid time type during allocation should generate error message
-<DATE><TIME>|<HOST>|E|psTimeAlloc (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeAlloc (FILE:LINENO)
     Specified type, 10, is not supported.
Index: trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 3127)
@@ -1,20 +1,20 @@
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to open file 'zzz'. Check if it exists and it has the proper permissions.
-<DATE><TIME>|<HOST>|E|psLibInit (psConfigure.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
     Failed to initialize psTime.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/ser7.dat.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/eopc01_1900_2004.dat.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/finals_all.dat.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/tai_utc.dat.
-<DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
     Incorrect number of table files entered. Found: 3. Expected: 4.
-<DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
     Incorrect vector size. Size: 3, Expected 4.
-<DATE><TIME>|<HOST>|E|psLibInit (psConfigure.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
     Failed to initialize psTime.
-<DATE><TIME>|<HOST>|E|printError (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|printError (FILE:LINENO)
     Unable to parse string, 53yyy244 on line 16.
Index: trunk/psLib/test/collections/Makefile.am
===================================================================
--- trunk/psLib/test/collections/Makefile.am	(revision 3125)
+++ trunk/psLib/test/collections/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for collections functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -32,5 +34,5 @@
          tst_psScalar
  
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
          tst_psVector          \
Index: trunk/psLib/test/collections/verified/tst_psArray.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psArray.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psArray.stderr	(revision 3127)
@@ -1,6 +1,6 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psArrayRealloc (psArray.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psArrayRealloc (FILE:LINENO)
     psArrayRealloc must be given a non-NULL psArray to resize.
-<DATE><TIME>|<HOST>|E|psArrayRemove (psArray.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psArrayRemove (FILE:LINENO)
     Specified psArray can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psBitSet.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psBitSet.stderr	(revision 3127)
@@ -9,5 +9,5 @@
 <DATE><TIME>|<HOST>|I|testBitSet01a
     Following is an error.
-<DATE><TIME>|<HOST>|E|psBitSetAlloc (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetAlloc (FILE:LINENO)
     The number of bit in a psBitSet (-4) must be greater than zero.
 
@@ -32,13 +32,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
     The specified bit position (-4) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
     The specified bit position (200) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
     Can not operate on a NULL psBitSet.
 
@@ -56,13 +56,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
     The specified bit position (-4) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
     The specified bit position (200) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
     Can not operate on a NULL psBitSet.
 
@@ -77,13 +77,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
     The psBitSet operand must be the same size.
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following is an error.
-<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
     Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following is an error.
-<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
     Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
 
Index: trunk/psLib/test/collections/verified/tst_psHash01.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash01.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash01.stderr	(revision 3127)
@@ -1,12 +1,12 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashAdd with null table
-<DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
     Input psHash can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashAdd with null key
-<DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
     Input key can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashAdd with null data
-<DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
     Input data can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psHash02.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash02.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash02.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashLookup with null table
-<DATE><TIME>|<HOST>|E|psHashLookup (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashLookup (FILE:LINENO)
     Input psHash can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashLookup with null key
-<DATE><TIME>|<HOST>|E|psHashLookup (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashLookup (FILE:LINENO)
     Input key can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psHash03.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash03.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash03.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashRemove with null table
-<DATE><TIME>|<HOST>|E|psHashRemove (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashRemove (FILE:LINENO)
     Input psHash can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashRemove with null key
-<DATE><TIME>|<HOST>|E|psHashRemove (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashRemove (FILE:LINENO)
     Input key can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psHash05.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash05.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash05.stderr	(revision 3127)
@@ -7,5 +7,5 @@
 <DATE><TIME>|<HOST>|I|hashToArray
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psHashToArray (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashToArray (FILE:LINENO)
     Input psHash can not be NULL.
 
Index: trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 3127)
@@ -20,13 +20,13 @@
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should generate an error for using NULL list.
-<DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAdd (FILE:LINENO)
     Specified psList reference is NULL.
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should generate an error msg to add NULL data
-<DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAdd (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should error with invalid insert location
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, -7, is invalid.
 <DATE><TIME>|<HOST>|I|testListAdd
@@ -45,13 +45,13 @@
 <DATE><TIME>|<HOST>|I|testListGet
     Following should be an error
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified psList reference is NULL.
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, 5, is invalid.
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified location, 5, is invalid.
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, 4, is invalid.
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified location, 4, is invalid.
 
@@ -66,17 +66,17 @@
 <DATE><TIME>|<HOST>|I|testListRemove
     Following should be an error
-<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemove (FILE:LINENO)
     Specified psList reference is NULL.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified data item is not found in the psList.
 <DATE><TIME>|<HOST>|I|testListRemove
     NULL list in psListRemoveData should generate error message.
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified psList reference is NULL.
 
@@ -131,13 +131,13 @@
 <DATE><TIME>|<HOST>|I|testListAddAfter
     NULL data pointer should generate error message
-<DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAddAfter
     NULL iterator should generate error message
-<DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
     Specified iterator is NULL.
 <DATE><TIME>|<HOST>|I|testListAddAfter
     Non-mutable list should generate error message
-<DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
     Specified iterator indicates list is non-mutable.
 
@@ -152,13 +152,13 @@
 <DATE><TIME>|<HOST>|I|testListAddBefore
     NULL data pointer should generate error message
-<DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAddBefore
     NULL iterator should generate error message
-<DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
     Specified iterator is NULL.
 <DATE><TIME>|<HOST>|I|testListAddBefore
     Non-mutable list should generate error message
-<DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
     Specified iterator indicates list is non-mutable.
 
Index: trunk/psLib/test/collections/verified/tst_psScalar.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psScalar.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psScalar.stderr	(revision 3127)
@@ -9,5 +9,5 @@
 <DATE><TIME>|<HOST>|I|testScalarAlloc
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psScalarAlloc (psScalar.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psScalarAlloc (FILE:LINENO)
     Specified datatype (4865) is unsupported by psScalar.
 
@@ -24,9 +24,9 @@
 <DATE><TIME>|<HOST>|I|testScalarCopy
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psScalarCopy (psScalar.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psScalarCopy (FILE:LINENO)
     Specified datatype (4865) is unsupported by psScalar.
 <DATE><TIME>|<HOST>|I|testScalarCopy
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psScalarCopy (psScalar.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psScalarCopy (FILE:LINENO)
     Can not copy a NULL psScalar.
 
Index: trunk/psLib/test/collections/verified/tst_psVector.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 3127)
@@ -3,4 +3,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message.
-<DATE><TIME>|<HOST>|E|psVectorRealloc (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorRealloc (FILE:LINENO)
     psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown.
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error messgae
-<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     Input psVector is an unsupported type (4865).
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr	(revision 3127)
@@ -1,10 +1,10 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
     psVectorSort can not sort a NULL psVector.
 <DATE><TIME>|<HOST>|I|main
     Following should generate two error messages(psVectorSort,psVectorSortIndex)
-<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     Input psVector is an unsupported type (4865).
-<DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
     Input psVector is an unsupported type (4865).
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 3127)
@@ -1,2 +1,2 @@
-<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     psVectorSort can not sort a NULL psVector.
Index: trunk/psLib/test/dataIO/Makefile.am
===================================================================
--- trunk/psLib/test/dataIO/Makefile.am	(revision 3125)
+++ trunk/psLib/test/dataIO/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for fileUtils functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -17,5 +19,5 @@
 	tst_psFits
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psLookupTable_01 \
Index: trunk/psLib/test/dataIO/verified/tst_psFits.stderr
===================================================================
--- trunk/psLib/test/dataIO/verified/tst_psFits.stderr	(revision 3125)
+++ trunk/psLib/test/dataIO/verified/tst_psFits.stderr	(revision 3127)
@@ -16,14 +16,14 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Could not find HDU 'bogus' in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Specified extension name can not be NULL.
 
@@ -38,29 +38,29 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsGetSize (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsGetSize (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #-1 in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move -1 HDUs from current position in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #8 in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move 1 HDUs from current position in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -75,5 +75,5 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsReadHeader
     following should be an error (input psFits = NULL)
-<DATE><TIME>|<HOST>|E|psFitsReadHeader (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeader (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -86,5 +86,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -97,5 +97,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadTable (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadTable (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -119,5 +119,5 @@
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should generate an error message because input image is null.
-<DATE><TIME>|<HOST>|E|psFitsWriteImage (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsWriteImage (FILE:LINENO)
     The input psImage was NULL.  Need a non-NULL psImage for operation to be performed.
 
Index: trunk/psLib/test/dataManip/Makefile.am
===================================================================
--- trunk/psLib/test/dataManip/Makefile.am	(revision 3125)
+++ trunk/psLib/test/dataManip/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for dataManip functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -55,5 +57,5 @@
 	tst_psVectorFFT 
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psFunc00 \
Index: trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr	(revision 3127)
@@ -1,20 +1,20 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAlloc (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAlloc (FILE:LINENO)
     Error: max and min are equal.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSpline1DAlloc (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAlloc (FILE:LINENO)
     Error: max and min are equal.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
     Error: order is less than 0.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
     Unallowable operation: psVector bounds or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
     Unallowable operation: psVector bounds has no elements.
Index: trunk/psLib/test/dataManip/verified/tst_psHist00.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psHist00.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psHist00.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psHistogramAlloc (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHistogramAlloc (FILE:LINENO)
     Error: (lower > upper) (30.000000 20.000000)
Index: trunk/psLib/test/dataManip/verified/tst_psHist02.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psHist02.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psHist02.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorHistogram (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorHistogram (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorHistogram (FILE:LINENO)
     Unallowable operation: psVector in or its data is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
     Invalid operation: Pointer to inImage is same as outImage.
-<DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
     Invalid operation. inImage not PS_TYPE_F64.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixLUD (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixLUD (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixLUSolve (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve (FILE:LINENO)
     Unallowable operation: psVector inVector or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixLUSolve (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr	(revision 3127)
@@ -1,4 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMatrixInvert (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixInvert (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixInvert (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixInvert (FILE:LINENO)
     Unallowable operation: det is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixToVector (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixToVector (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixToVector (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixToVector (FILE:LINENO)
     Image does not have dim with 1 col or 1 row: (2 x 2).
-<DATE><TIME>|<HOST>|E|psVectorToMatrix (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorToMatrix (FILE:LINENO)
     Unallowable operation: psVector inVector or its data is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr	(revision 3127)
@@ -1,66 +1,66 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: input1 is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: input2 is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: op is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Unallowable operation: in is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Unallowable operation: op is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     ptr input1 has type 1028, ptr input2 has type 1032.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Specified psImage dimensions differed, 2x2 vs 3x3.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Number of elements inconsistent, 2 vs 3.  Number of elements must match.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Number of elements inconsistent, 2 vs 3.  Number of elements must match.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an two error messages
-<DATE><TIME>|<HOST>|E|psVectorRecycle (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorRecycle (FILE:LINENO)
     The input psVector must have a vector dimension type.
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Couldn't create a proper output psVector.
 <DATE><TIME>|<HOST>|I|main
     Following should generate error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     The minimum operation is not supported with complex data.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     The maximum operation is not supported with complex data.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error messgae
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Specified operation, yarg, is not supported.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Specified operation, yarg, is not supported.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: input1 has incorrect dimensionality.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Specified parameter, in, has invalid dimensionality, 4.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null input polynomial.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null input polynomial.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null arguments.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null arguments.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr	(revision 3127)
@@ -1,16 +1,16 @@
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null minimize.
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: min is NULL.
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null parameter vector
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: psVector params or its data is NULL.
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null coords.
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: coords is NULL.
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null function
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: func is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psRandom.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psRandom.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psRandom.stderr	(revision 3127)
@@ -1,20 +1,20 @@
 <DATE><TIME>|<HOST>|I|t00
     Invalid type, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomAlloc (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomAlloc (FILE:LINENO)
     Unknown Random Number Generator Type
 <DATE><TIME>|<HOST>|I|t01
     NULL psRandom variable, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomUniform (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomUniform (FILE:LINENO)
     Random variable is NULL.
 <DATE><TIME>|<HOST>|I|t02
     NULL psRandom variable, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomGaussian (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomGaussian (FILE:LINENO)
     Random variable is NULL.
 <DATE><TIME>|<HOST>|I|t03
     NULL psRandom variable, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomPoisson (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomPoisson (FILE:LINENO)
     Random variable is NULL.
 <DATE><TIME>|<HOST>|I|t04
     Reset a NULL psRandom variable, should generate an error message
-<DATE><TIME>|<HOST>|E|psRandomReset (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomReset (FILE:LINENO)
     Random variable is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psStats00.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psStats00.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psStats00.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorStats (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorStats (FILE:LINENO)
     Unallowable operation: psVector in or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorStats (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorStats (FILE:LINENO)
     Unallowable operation: stats is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 3127)
@@ -7,5 +7,5 @@
 <DATE><TIME>|<HOST>|I|testVectorFFT
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorFFT (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFFT (FILE:LINENO)
     Must specify the direction as either PS_FFT_FORWARD or PS_FFT_REVERSE.
 
@@ -37,9 +37,9 @@
 <DATE><TIME>|<HOST>|I|testVectorComplex
     Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psVectorComplex (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorComplex (FILE:LINENO)
     Real psVector type, psF32, and imaginary psVector type, psF64, must be the same.
 <DATE><TIME>|<HOST>|I|testVectorComplex
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorComplex (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorComplex (FILE:LINENO)
     Input psVector type, psS8, is required to be either psF32 or psF64.
 
@@ -67,5 +67,5 @@
 <DATE><TIME>|<HOST>|I|testVectorPowerSpectrum
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorPowerSpectrum (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorPowerSpectrum (FILE:LINENO)
     Input psVector type, psF32, is required to be either psC32 or psC64.
 
Index: trunk/psLib/test/fileUtils/Makefile.am
===================================================================
--- trunk/psLib/test/fileUtils/Makefile.am	(revision 3125)
+++ trunk/psLib/test/fileUtils/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for fileUtils functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -17,5 +19,5 @@
 	tst_psFits
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psLookupTable_01 \
Index: trunk/psLib/test/fileUtils/verified/tst_psFits.stderr
===================================================================
--- trunk/psLib/test/fileUtils/verified/tst_psFits.stderr	(revision 3125)
+++ trunk/psLib/test/fileUtils/verified/tst_psFits.stderr	(revision 3127)
@@ -16,14 +16,14 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Could not find HDU 'bogus' in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Specified extension name can not be NULL.
 
@@ -38,29 +38,29 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsGetSize (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsGetSize (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #-1 in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move -1 HDUs from current position in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #8 in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move 1 HDUs from current position in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -75,5 +75,5 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsReadHeader
     following should be an error (input psFits = NULL)
-<DATE><TIME>|<HOST>|E|psFitsReadHeader (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeader (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -86,5 +86,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -97,5 +97,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadTable (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadTable (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -119,5 +119,5 @@
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should generate an error message because input image is null.
-<DATE><TIME>|<HOST>|E|psFitsWriteImage (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsWriteImage (FILE:LINENO)
     The input psImage was NULL.  Need a non-NULL psImage for operation to be performed.
 
Index: trunk/psLib/test/image/Makefile.am
===================================================================
--- trunk/psLib/test/image/Makefile.am	(revision 3125)
+++ trunk/psLib/test/image/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for image functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -27,5 +29,5 @@
 	tst_psImageInterpolate
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psImage \
Index: trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3127)
@@ -11,5 +11,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -17,5 +17,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -29,5 +29,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -35,5 +35,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -41,5 +41,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -47,5 +47,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -53,5 +53,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -59,5 +59,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -65,5 +65,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -71,5 +71,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -77,5 +77,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -83,5 +83,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 
@@ -112,5 +112,5 @@
 <DATE><TIME>|<HOST>|I|testImageCopy
     An error should follow...
-<DATE><TIME>|<HOST>|E|psImageCopy (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCopy (FILE:LINENO)
     Can not operate on a NULL psImage.
 
@@ -123,6 +123,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psRegionFromString (psImage.c:<LINENO>)
-    Specified subsection string, '[1:<LINENO>,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psRegionFromString (FILE:LINENO)
+    Specified subsection string, '[1:2,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 
 ---> TESTPOINT PASSED (psImage{psRegionAlloc} | tst_psImage.c)
Index: trunk/psLib/test/image/verified/tst_psImageConvolve.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 3127)
@@ -24,17 +24,17 @@
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Shift vectors can not be of different sizes.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (time vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Specified shift vectors can not be NULL.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (x vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Specified shift vectors can not be NULL.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (y vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Specified shift vectors can not be NULL.
 
Index: trunk/psLib/test/image/verified/tst_psImageExtraction.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 3127)
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -29,42 +29,42 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,128:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,128:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [64:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,0:511], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:255,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [-1:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,-1:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:128,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:128,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     psImageFreeChildren shall deallocate any children images of a psImage structure
@@ -79,46 +79,46 @@
 
 <DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [32:<LINENO>,32:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [64:<LINENO>,32:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [32:<LINENO>,128:<LINENO>].
+    Testing subsection [0:32,0:32].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [32:64,32:64].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [64:127,32:64].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [32:64,128:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x1>x2)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid.  Ranges must be incremental.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subset range, [64:32,32:64], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y1>y2)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid.  Ranges must be incremental.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subset range, [32:64,64:32], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x2>nCols)
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [64:256,32:64], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y2>=nRows)
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [32:64,64:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no brackets)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subsection string, '32:<LINENO>,32:<LINENO>', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subsection string, '32:64,32:64', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no colons)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     Specified subsection string, '[32-64,32-64]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - not four numbers)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subsection string, '[32:<LINENO>,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subsection string, '[32:64,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (image is NULL)
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (subsection string is NULL)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     Specified subsection string can not be NULL.
 
@@ -133,49 +133,49 @@
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified slice direction, 5, is invalid.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [301:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,201:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:30,20:20], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [301:302,20:30], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:31,201:205], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:301,20:21], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:31,20:201], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error mask size != image size.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Input psImage mask size, 200x300, does not match psImage input size, 300x200.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error invalid mask type.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Input psImage mask type, psS8, is not the supported mask datatype of psU8.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error invalid image type.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified psImage type, psU8, is not supported.
 
@@ -188,18 +188,18 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:-1,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:-1], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [-1:299,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,-1:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:300,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,0:200], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:-1,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,0:-1], is invalid or outside input psImage's boundaries, [0:299,0:199].
 
 ---> TESTPOINT PASSED (psImage{psImageTrim} | tst_psImageExtraction.c)
@@ -213,41 +213,41 @@
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (NULL image).
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (length=0).
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     Specified number of samples, 0, must be greater than 1 to make a line.
 
@@ -262,37 +262,37 @@
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified radii vector can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
-    Specified center, (301,100), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
-    Specified center, (150,201), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Specified center, (301,100), is outside of the psImage boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Specified center, (150,201), is outside of the psImage boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Input psImage mask size, 150x100, does not match psImage input size, 300x200.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Input radii vector size, 1, can not be less than 2.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 
Index: trunk/psLib/test/image/verified/tst_psImageFFT.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 3127)
@@ -7,13 +7,13 @@
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options.
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported.
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should generate error for invalid direction.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option.
 
@@ -37,13 +37,13 @@
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Real psImage type (psF32) and imaginary psImage type (psF64) must be the same.
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (size mismatch).
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Real psImage size (128x64) and imaginary psImage size (64x64) must be the same.
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Input psImage type, psS16, is required to be either psF32 or psF64.
 
@@ -67,5 +67,5 @@
 <DATE><TIME>|<HOST>|I|testImagePowerSpectrum
     Following should generate error message.
-<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (FILE:LINENO)
     Input psImage type, psF32, is required to be either psC32 or psC64.
 
Index: trunk/psLib/test/image/verified/tst_psImageIO.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 3127)
@@ -329,5 +329,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not open file,'foobar.fits'.
     CFITSIO Error: could not open the named file
@@ -336,5 +336,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Specified filename can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRead
@@ -342,5 +342,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not find HDU #4 in file tmpImages/MxN_F32.fits.
     CFITSIO Error: tried to move past end of file
@@ -349,5 +349,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not find HDU with extension name 'bogus' in file tmpImages/MxN_F32.fits.
     CFITSIO Error: illegal HDU number
@@ -371,5 +371,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageWrite
@@ -377,5 +377,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not create file,'panstarrs/writeFits.fits'.
     CFITSIO Error: couldn't create the named file
@@ -384,5 +384,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not open file,'tmpImages/writeInvalidFile.fits'.
     CFITSIO Error: tried to move past end of file
@@ -391,5 +391,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not find HDU with extension name 'ext2' in file tmpImages/writeTest.fits.
     CFITSIO Error: illegal HDU number
@@ -398,5 +398,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Specified extension number, 99, must not exceed number of HDUs, 1, by more than one.
 
Index: trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3127)
@@ -16,13 +16,13 @@
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 
Index: trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3127)
@@ -27,5 +27,5 @@
 <DATE><TIME>|<HOST>|I|testImageClip
     Following should be an error (max<min)
-<DATE><TIME>|<HOST>|E|psImageClip (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClip (FILE:LINENO)
     Specified min value, 256, can not be greater than the specified max value, 128.
 
@@ -42,5 +42,5 @@
 <DATE><TIME>|<HOST>|I|testImageClipNAN
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psImageClipNaN (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipNaN (FILE:LINENO)
     Specified psImage type, psS32, is not supported.
 
@@ -61,53 +61,53 @@
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified imaginary-portion of min value, 10, can not be greater than the imaginary-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified psImage type, psS32, is not supported.
 
@@ -122,25 +122,25 @@
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay isn't within image boundaries
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
+    Specified subset range, [32:160,64:320], is invalid or outside input psImage's boundaries, [0:128,0:256].
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as image input is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Specified operation, '$', is not supported.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Operation can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is a different type
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Input overlay psImage type, psS64, must match input psImage type, psF32.
 
@@ -155,31 +155,31 @@
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for unsupported type.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified psImage type, psU8, is not supported.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for invallid mask type.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for scale < 0.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified scale value, 0, must be a positive value.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats null.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats options 0.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stat options use range.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 8192, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats with multiple options.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 2049, is not valid.  Must specify one and only one statistic type.
 
@@ -194,5 +194,5 @@
 <DATE><TIME>|<HOST>|I|testImageRoll
     Following should generate an error.
-<DATE><TIME>|<HOST>|E|psImageRoll (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRoll (FILE:LINENO)
     Can not operate on a NULL psImage.
 
@@ -351,9 +351,9 @@
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error
-<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error for invalid interpolation type.
-<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
     Specified interpolation mode, -1, is unsupported.
 
@@ -402,9 +402,9 @@
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error...
-<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error for invalid interpolation mode.
-<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
     Specified interpolation mode, -1, is unsupported.
 
@@ -417,11 +417,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified scale value, 0, must be a positive value.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified interpolation mode, 0, is unsupported.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 
Index: trunk/psLib/test/image/verified/tst_psImageStats00.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 3127)
@@ -1,10 +1,10 @@
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: in is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error for invalid mask type.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: psImage mask has incorrect type.
Index: trunk/psLib/test/image/verified/tst_psImageStats01.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 3127)
@@ -1,8 +1,8 @@
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Error: stats->options is 0.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Unallowable operation: stats is NULL.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Error: stats->options is 0.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Unallowable operation: psImage mask has incorrect type.
Index: trunk/psLib/test/image/verified/tst_psImageStats02.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 3127)
@@ -1,16 +1,16 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE:LINENO)
     Unallowable operation: polynomial coeffs or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be a error message for NULL input argument.
-<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE:LINENO)
     Unallowable operation: psImage input or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
     Unallowable operation: polynomial coeffs or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be a error message for NULL input argument.
-<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
     Unallowable operation: psImage input or its data is NULL.
Index: trunk/psLib/test/runTest
===================================================================
--- trunk/psLib/test/runTest	(revision 3125)
+++ trunk/psLib/test/runTest	(revision 3127)
@@ -28,5 +28,5 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-03 00:54:12 $
+#  $Date: 2005-02-04 22:49:37 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -36,4 +36,6 @@
 # Provides functions for handling psS64 command line options
 use Getopt::Long;
+
+$verifiedDir = "verified";
 
 # Assign variables based on the presence of command line options to the script
@@ -42,4 +44,5 @@
     "resetStderr!" => \$resetStderr,
     "resetStdout!" => \$resetStdout,
+    "verified=s"   => \$verifiedDir,
     "help!"        => \$help
 );
@@ -83,5 +86,5 @@
 
     # Check if a verified directory exists in the current work directory
-    if ( !( -e "verified" ) ) {
+    if ( !( -e $verifiedDir ) ) {
 
         # Display message that verified subdirectory doesn't exist
@@ -133,5 +136,5 @@
             # Open mod file to place filtered STDOUT
             open( MODFILE,  "> temp/$testFile.stdout.mod" );
-            open( MODFILE2, "> verified/$testFile.stdout" ) if $resetStdout;
+            open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
 
            # Replace the variable date, time and host information with constants
@@ -143,5 +146,5 @@
                 s/$hostname\s*/<HOST>/g;
                 s/: Line \d+/: Line <LINENO>/g;
-                s/\:\d+/\:<LINENO>/g;
+                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -166,5 +169,5 @@
             # Open mod file to place filtered STDERR
             open( MODFILE,  "> temp/$testFile.stderr.mod" );
-            open( MODFILE2, "> verified/$testFile.stderr" ) if $resetStderr;
+            open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
 
            # Replace the variable date, time and host information with constants
@@ -174,5 +177,5 @@
                 s/$hostname\s*/<HOST>/g;
                 s/: Line \d+/: Line <LINENO>/g;
-                s/\:\d+/\:<LINENO>/g;
+                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -193,5 +196,5 @@
 
             # Compare STDOUT capture with verified file
-            $exitValue |= &compareStream("verified/$testFile.stdout");
+            $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
 
             # Check exit value to determine if verified file doesn't exist
@@ -204,5 +207,5 @@
 
             # Compare STDERR capture with verified file
-            $exitValue |= &compareStream("verified/$testFile.stderr");
+            $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
 
             # Check exit value to determine if verified file doesn't exist
@@ -330,5 +333,5 @@
         # Create name of the temp file to compare
         $tempFile = $streamFile;
-        $tempFile =~ s/verified/temp/;
+        $tempFile =~ s/$verifiedDir/temp/;
         $tempFile = $tempFile . ".mod";
 
Index: trunk/psLib/test/sysUtils/Makefile.am
===================================================================
--- trunk/psLib/test/sysUtils/Makefile.am	(revision 3125)
+++ trunk/psLib/test/sysUtils/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for sysUtils functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -22,5 +24,5 @@
 	tst_psConfigure
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psAbort      \
Index: trunk/psLib/test/sysUtils/verified/tst_psError.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 3125)
+++ trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 3127)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
     ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
-<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
     NO VALUES
-<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
 
 ---> TESTPOINT PASSED (psError{psError()} | tst_psError.c)
@@ -19,25 +19,25 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = 262
-ERROR STACK PRINT Test1A -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
+ERROR STACK PRINT Test1A -> testError01 (FILE:LINENO): parameter is out-of-range
      Error code = 262
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = 263
-ERROR STACK PRINT Test1B -> testError01 (tst_psError.c:<LINENO>): parameter is of unsupported type
+ERROR STACK PRINT Test1B -> testError01 (FILE:LINENO): parameter is of unsupported type
      Error code = 263
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = -1
-ERROR STACK PRINT Test1D -> testError01 (tst_psError.c:<LINENO>): (null)
+ERROR STACK PRINT Test1D -> testError01 (FILE:LINENO): (null)
      Error code = -1
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = 262
-ERROR STACK PRINT Test1E -> testError01 (tst_psError.c:<LINENO>): (null)
+ERROR STACK PRINT Test1E -> testError01 (FILE:LINENO): (null)
      Error code = -1
- -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
+ -> testError01 (FILE:LINENO): parameter is out-of-range
      Error code = 262
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Errno code = 9
-ERROR STACK PRINT Test1F -> testError01 (tst_psError.c:<LINENO>): Bad file descriptor
+ERROR STACK PRINT Test1F -> testError01 (FILE:LINENO): Bad file descriptor
      Errno code = 9
 
@@ -50,7 +50,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError02 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError02 (FILE:LINENO)
     Error code = 262
-ERROR STACK PRINT Test2A -> testError02 (tst_psError.c:<LINENO>): parameter is out-of-range
+ERROR STACK PRINT Test2A -> testError02 (FILE:LINENO): parameter is out-of-range
      Error code = 262
 
@@ -63,9 +63,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
     Error code = 262
-<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
     Error code = 263
-<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
     Error code = 264
 
@@ -78,9 +78,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
     Error code = 262
-<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
     Error code = 263
-<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
     Error code = 264
 
@@ -106,5 +106,5 @@
 <DATE><TIME>|<HOST>|I|testErrorRegister
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psErrorRegister (psErrorCodes.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psErrorRegister (FILE:LINENO)
     Specified psErrorDescription pointer can not be NULL.
 
Index: trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 3125)
+++ trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 3127)
@@ -21,5 +21,5 @@
     Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|p_psAlloc
-    Failed to allocate <N> bytes at tst_psMemory.c:<LINENO>
+    Failed to allocate <N> bytes at tst_psMemory.c:206
 
 ---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
@@ -36,5 +36,5 @@
     Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|p_psRealloc
-    Failed to reallocate <N> bytes at tst_psMemory.c:<LINENO>
+    Failed to reallocate <N> bytes at tst_psMemory.c:171
 
 ---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
@@ -91,5 +91,5 @@
     following psMemCheckLeaks call should produce one instance.
                    file:line ID
-         tst_psMemory.c:<LINENO>  1
+         tst_psMemory.c:356  1
 <DATE><TIME>|<HOST>|I|TPcheckLeaks
     Testing psMemCheckLeaks again with a different leak location
@@ -97,5 +97,5 @@
     following psMemCheckLeaks call should produce one error.
                    file:line ID
-         tst_psMemory.c:<LINENO>  11
+         tst_psMemory.c:386  11
 <DATE><TIME>|<HOST>|I|TPcheckLeaks
     Testing psMemCheckLeaks again with multiple leak locations.
@@ -103,6 +103,6 @@
     following psMemCheckLeaks call should produce two errors.
                    file:line ID
-         tst_psMemory.c:<LINENO>  16
-         tst_psMemory.c:<LINENO>  14
+         tst_psMemory.c:414  16
+         tst_psMemory.c:414  14
 
 ---> TESTPOINT PASSED (psMemory{checkLeaks} | tst_psMemory.c)
@@ -118,8 +118,8 @@
 <DATE><TIME>|<HOST>|I|TPmemCorruption
     psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
-<DATE><TIME>|<HOST>|E|checkMemBlock (psMemory.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|checkMemBlock (FILE:LINENO)
     Memory block 1 is corrupted; buffer underflow detected.
 <DATE><TIME>|<HOST>|I|memProblemCallback
-    memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
+    memory callback called for id 1 (FILE:LINENO).
 
 ---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
@@ -147,5 +147,5 @@
     Next should abort due to multiple freeing.
 <DATE><TIME>|<HOST>|A|p_psFree
-    Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
+    Block 1, allocated at tst_psMemory.c:526, freed multiple times at tst_psMemory.c:531.
 
 ---> TESTPOINT PASSED (psMemory{multipleFree} | tst_psMemory.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 3125)
+++ trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 3127)
@@ -50,5 +50,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psStringNCopy (psString.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psStringNCopy (FILE:LINENO)
     Can not copy a negative number of characters (-5).