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.