Cleanup from previous reviews, add barrier for CxxTest

- add IStep1 for demo
- cleanup:  remove inheritance, add errlog tags, etc.
- inadvertently ran copyright script, this is OK.
- more cleanup: indentation, etc.
- add barrier for CxxTests
- rename cxxtest_stub.C to cxxtest_data.C
- merge problems on gerrit
- fix review comments

Change-Id: Iee988b8595d8c6dd521fd94d4d58cb403898d948
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/207
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 22 insertions, 21 deletions

diff --git a/src/usr/cxxtest/TestSuite.C b/src/usr/cxxtest/TestSuite.C
index 79677b83b..2af815346 100755
--- a/src/usr/cxxtest/TestSuite.C
+++ b/src/usr/cxxtest/TestSuite.C
@@ -1,3 +1,20 @@
+/****************************************************************************
+ * $IBMCopyrightBlock:
+ * 
+ *  IBM Confidential
+ * 
+ *  Licensed Internal Code Source Materials
+ * 
+ *  IBM HostBoot Licensed Internal Code
+ * 
+ *  (C) Copyright IBM Corp. 2011
+ * 
+ *  The source code for this program is not published or other-
+ *  wise divested of its trade secrets, irrespective of what has
+ *  been deposited with the U.S. Copyright Office.
+ * $
+****************************************************************************/
+
 // Imported from FSP tree - /src/test/cxxtest/cxxtest/
 
 #ifndef __cxxtest__TestSuite_cpp__
@@ -15,26 +32,6 @@ namespace CxxTest
 // Globals/Constants
 /******************************************************************************/
 
-/**
- * @brief global vars to keep track of unit tests.
- *
- * totaltests - initialized to 0, updated by reporttotaltests() below.
- *      each test suite will call reporttotaltests after all tests have
- *      run with the total number of tests for that suite.
- *      Once all the testsuites have run, the global totaltests will hold
- *      the total of number of unit test for that run.
- *
- *      Each unit test macro (TS_TRACE, TS_WARN, and TS_FAIL) will update
- *      the proper variable.  At the end the unit tester will print out
- *      the totals.
- * // Global cxxtest values - Keep global so it can be found in syms file
- */
-uint64_t        g_TotalTests      =       0;
-uint64_t        g_TraceCalls      =       0;
-uint64_t        g_Warnings        =       0;
-uint64_t        g_FailedTests     =       0;
-
-
 //
 // TestSuite members
 //
@@ -109,7 +106,11 @@ void    reportTotalTests( const char *suitename, uint64_t numtests )
 
     //  $$TODO do nothing with the suite name for now, later it may be useful
     __sync_add_and_fetch( &g_TotalTests, numtests );
-    printk( "%s completed %ld tests\n", suitename, numtests);
+    TRACDBIN( g_trac_test,
+            "Suite Completed: ",
+            suitename,
+            strlen(suitename) );
+    // printk( "%s completed %ld tests\n", suitename, numtests);
 
     return;
 }