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, 4 insertions, 0 deletions

diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C
index b4785cbc5..5efb1827e 100644
--- a/src/usr/cxxtest/cxxtestexec.C
+++ b/src/usr/cxxtest/cxxtestexec.C
@@ -2,6 +2,7 @@
 #include <sys/task.h>
 #include <string.h>
 #include <kernel/console.H>
+#include <sys/time.h>
 
 namespace CxxTest
 {
@@ -27,6 +28,8 @@ void _start(void*)
             if (NULL != vfsItr->start)
             {
                 __sync_add_and_fetch(&CxxTest::g_ModulesStarted, 1);
+                printk( "running %s, ModulesStarted=0x%ld\n",
+                        vfsItr->module, CxxTest::g_ModulesStarted );
                 task_exec(vfsItr->module, NULL);
             }
         }
@@ -34,6 +37,7 @@ void _start(void*)
     }
 
     __sync_add_and_fetch(&CxxTest::g_ModulesCompleted, 1);
+    printk( " ModulesCompleted=0x%ld\n", CxxTest::g_ModulesCompleted );
 
     task_end();
 }