Index: trunk/psLib/test/sys/tap_psString.c
===================================================================
--- trunk/psLib/test/sys/tap_psString.c	(revision 24023)
+++ trunk/psLib/test/sys/tap_psString.c	(revision 41171)
@@ -111,16 +111,16 @@
     {
         psMemId id = psMemGetId();
-        psS32   result = 0;
-        psS32   result1 = 0;
-        char  *strResult;
         char  *stringvalnocopy = "F A I L";
 
         // Test point #4 Verify empty string copy with length - psStringNCopy
-        strResult = psStringNCopy(stringvalnocopy, 0);
-        // Perform string compare and get sting length
-        result = strcmp(strResult, stringvalnocopy);
-        result1 = strlen(strResult);
-        ok(result != 0,
-             "test point #4 strcmp result = %d didn't expected %d",result,0);
+        char *strResult = psStringNCopy(stringvalnocopy, 0);
+
+        // Perform string compare and get string length
+        int result = strcmp(strResult, stringvalnocopy);
+        ok(result != 0, "test point #4 strcmp result = %d, expected %d", result, 4);
+
+        int resultLen = strlen(strResult);
+        ok(resultLen == 0, "test point #4 strcmp result = %d, expected %d", resultLen, 0);
+
         psFree(strResult);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -149,25 +149,24 @@
     }
 
-// XXX This test needs to be modified to check for maximum size
-//     This will require a mod to psStringNCopy source to check for maximum size
-//
-//psS32 testStringCopy05()
-//{
-//    char  *strResult;
-//    char  stringval[20] = "E R R O R";
-//    psS32   negativeSize = -5;
-//
-//    // Test point #6 Copy string with negative size - psStringNCopy
-//    strResult = psStringNCopy(stringval, negativeSize);
-//    if ( strResult != NULL ) {
-//        fprintf(stderr,"Failed test point #6 return value = %p expected NULL\n",
-//                strResult);
-//        return 1;
-//    }
-//    // Memory should not have been allocated
-//
-//    return 0;
-//}
-
+    // XXX This test needs to be modified to check for maximum size
+    // This will require a mod to psStringNCopy source to check for maximum size
+
+    // psS32 testStringCopy05()
+    skip_start (1, 6, "Skipping psSTringNCopy() because of failure to test max value");
+    {
+      char  *strResult;
+      char  stringval[20] = "E R R O R";
+      psS32   negativeSize = -5;
+
+      // Test point #6 Copy string with negative size - psStringNCopy
+      strResult = psStringNCopy(stringval, negativeSize);
+      if ( strResult != NULL ) {
+        fprintf(stderr,"Failed test point #6 return value = %p expected NULL\n",
+                strResult);
+        return 1;
+      }
+      // Memory should not have been allocated
+    }
+    skip_end();
 
     // testStringCopy06()
@@ -200,17 +199,15 @@
     }
 
-#if 0
     // testStrAppend01()
     {
         psMemId id = psMemGetId();
-        char *str=NULL;
+        char *str = NULL;
         // test nonsensical invocations ...
         ssize_t sz = psStringAppend(NULL, NULL);
-        ok(sz == 0, "Failed test point");
+        ok(!sz, "append NULL string to NULL string");
         sz = psStringAppend(&str, NULL);
-        ok(sz == 0, "Failed test point");
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-#endif
+        ok(!sz, "append NULL string to NULL string");
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 
     // testStrAppend02()
@@ -251,5 +248,4 @@
     }
 
-#if 0
     // testStrPrepend01()
     {
@@ -263,5 +259,4 @@
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
-#endif
 
     // testStrPrepend02()