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).