Fixes to cxxtest, + add debug for trace

- cxxtestgen.pl was counting the tests wrong
    (did not reset # tests between suites)

- to be continued...

Change-Id: Ic060bcaf38dee39a620b3bef7c651851547442dc
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/423
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>

1 files changed, 15 insertions, 6 deletions

diff --git a/src/usr/errl/test/errltest.H b/src/usr/errl/test/errltest.H
index b1d105215..0ac45d019 100644
--- a/src/usr/errl/test/errltest.H
+++ b/src/usr/errl/test/errltest.H
@@ -72,9 +72,9 @@ public:
         // the two 64-bit user data parameters in the error log.
         // l_userData1 = 16bit(0):l_bit8_1:l_bit8_2:l_32bit_1
         uint8_t l_8bit_1 = TEST_USR_8BIT_1;      // 0x80
-        uint8_t l_8bit_2 = TEST_USR_8BIT_2;      // 0x93 
+        uint8_t l_8bit_2 = TEST_USR_8BIT_2;      // 0x93
         uint32_t l_32bit_1 = TEST_USR_32BIT_1;   // 0x80000001
-        uint64_t l_userData1 = 
+        uint64_t l_userData1 =
           TWO_UINT32_TO_UINT64( TO_UINT32(TWO_UINT8_TO_UINT16(l_8bit_1, l_8bit_2)), l_32bit_1);
             // yields 0x0000809380000001
 
@@ -86,6 +86,8 @@ public:
         uint64_t l_userData2 = TWO_UINT16_ONE_UINT32_TO_UINT64(l_16bit_1, l_16bit_2, l_32bit_2);
             // yields 0x8000900390000003
 
+        TRACDCOMP( g_trac_test, "testErrl1");
+        TS_TRACE( "testErrl1, Create error log...");
         // Create an error log
         errlHndl_t l_err = new ERRORLOG::ErrlEntry(
                                 ERRORLOG::ERRL_SEV_INFORMATIONAL,
@@ -106,6 +108,7 @@ public:
         // but errlffdc.H is not publicly includable to give me the definition
         // for it.  addFFDC() should return a Boolean indication of success.
 
+        TS_TRACE( "Add ffdc1");
         const char * pch = "martha washington";
         pffdc = l_err->addFFDC( ERRL_COMP_ID, pch, strlen( pch ), 1, 2 );
         if ( NULL == pffdc )
@@ -113,20 +116,23 @@ public:
             TS_FAIL("testErrl1: addFFDC() output NULL pointer");
         }
 
-        pch = "george washington"; 
+        TS_TRACE( "Add ffdc2");
+        pch = "george washington";
         pffdc = l_err->addFFDC( DEVFW_COMP_ID, pch, strlen( pch ), 3, 4 );
         if ( NULL == pffdc )
         {
             TS_FAIL("testErrl1: addFFDC() output NULL pointer");
         }
 
-        pch = "dwight eisenhour";  
+        TS_TRACE( "Add ffdc3");
+        pch = "dwight eisenhour";
         pffdc = l_err->addFFDC( SCOM_COMP_ID, pch, strlen( pch ), 5, 6 );
         if ( NULL == pffdc )
         {
             TS_FAIL("testErrl1: addFFDC() output NULL pointer");
         }
 
+        TS_TRACE( "Add ffdc4");
         pch = "ronald ";
         pffdc = l_err->addFFDC( ERRL_COMP_ID, pch, strlen( pch ), 7, 8 );
         if ( NULL == pffdc )
@@ -134,19 +140,21 @@ public:
             TS_FAIL("testErrl1: addFFDC() output NULL pointer");
         }
 
+        TS_TRACE( "Append ffdc1");
         // Append data to something already added.
         pch = "reagan";
         l_err->appendToFFDC( pffdc, pch, strlen(pch) );
 
 
         // Add null data.
+        TS_TRACE( "Append ffdc2");
         pffdc = l_err->addFFDC( ERRL_COMP_ID, NULL, 0,  9, 10 );
         if ( NULL != pffdc )
         {
             TS_FAIL("testErrl1: addFFDC() returned non null");
         }
-     
- 
+
+
 
 
 
@@ -208,6 +216,7 @@ public:
         uint64_t l_userData2 =
                 TWO_UINT32_TO_UINT64(TO_UINT32(l_8bit_1), TO_UINT32(l_16bit_1));
 
+        TS_TRACE( "testErrl2");
         // Create an error log
         errlHndl_t l_err = new ERRORLOG::ErrlEntry(
                                 ERRORLOG::ERRL_SEV_UNRECOVERABLE,