TS_TRACE now dumps to trace buffer instead of printk

-Minor change to cxxtestgen.pl script to bump the suite name and add whitespace
- resolve conflicts in makefile and cxxtestgen.pl
- fix TS_TRACE
- add fixes from code review
- add debug messages to trace modules not finishing problem
- line over 80 chars, remove 10 sec delay
- add 5 min timeout to autocitest
- change check interval to 5 seconds instead of 30 seconds

Change-Id: I11f18fbeed007590a4ca70c45d109071474a9864
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/154
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/usr/initservice/test/initservicetest.H b/src/usr/initservice/test/initservicetest.H
index 3edfa2885..d05dbd583 100644
--- a/src/usr/initservice/test/initservicetest.H
+++ b/src/usr/initservice/test/initservicetest.H
@@ -95,7 +95,6 @@ public:
         if ( (int16_t)tidrc < 0  )
         {
             TS_TRACE( "SUCCESS: startTask returned an errorlog.\n");
-            //  @todo   dump error log to trace?
         }
         else
         {
@@ -127,7 +126,6 @@ public:
         if ( (int16_t)tidrc >= 0  )
         {
             TS_TRACE( "SUCCESS: startTask returned OK.\n");
-            //  @todo   dump error log to trace?
         }
         else
         {
@@ -160,7 +158,6 @@ public:
         if ( (int16_t)tidrc < 0  )
         {
             TS_TRACE( "SUCCESS: startTask returned an error log.\n");
-            //  @todo   dump error log to trace?
         }
         else
         {
@@ -192,6 +189,10 @@ public:
         {
             TS_FAIL( "ERROR:  expected the NULL errlHndl_t to stay NULL\n");
         }
+        else
+        {
+            TS_TRACE( "SUCCESS: reportError returned OK.");
+        }
 
         return;
     }
@@ -225,11 +226,14 @@ public:
         {
             TS_FAIL( "ERROR: reportError did not delete the errlHndl_t handle!\n" );
         }
-
-
+        else
+        {
+            TS_TRACE( "SUCCESS: reportError returned OK.");
+        }
 
         return;
     }
+
 };  // class InitServiceTest