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.