Output list of cxxtest failures

Include a list of the first 10 cxxtest failures with the summary
of the cxxtest results.

Change-Id: I932b63d29b26f6d5afff7c3f5a67679e2a66fd5f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36168
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 58 insertions, 12 deletions

diff --git a/src/include/usr/cxxtest/TestSuite.H b/src/include/usr/cxxtest/TestSuite.H
index dcc3bbfee..cc27ec321 100755
--- a/src/include/usr/cxxtest/TestSuite.H
+++ b/src/include/usr/cxxtest/TestSuite.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -39,6 +39,7 @@
 
 #include    <trace/interface.H>
 #include    <sys/sync.h>
+#include    <usr/cxxtest/cxxtest_data.H>
 
 extern  trace_desc_t   *g_trac_test;
 
@@ -48,13 +49,14 @@ namespace CxxTest
 /**
  * @note extern declarations - see lib/cxxtest_data.C
  *
- * @see g_TotalTests, g_TraceCalls, g_Warnings, g_FailedTests
+ * @see g_TotalTests, g_TraceCalls, g_Warnings, g_FailedTests, g_FailedTestList
  */
 extern  uint64_t        g_TotalTests;
 extern  uint64_t        g_TraceCalls;
 extern  uint64_t        g_Warnings;
 extern  uint64_t        g_FailedTests;
 extern  barrier_t       g_CxxTestBarrier;
+extern  CxxTestFailedEntry g_FailedTestList[CXXTEST_FAIL_LIST_SIZE];
 
 /**
  * @class   TestSuite
@@ -87,6 +89,7 @@ void doFailAssert(  const char *file,
 void reportTotalTests(  const char *suitename,
                         uint64_t numtests );
 
+extern uint64_t g_ModulesStarted;
 extern uint64_t g_ModulesCompleted;
 
 #define _TS_TRY
@@ -117,15 +120,6 @@ extern uint64_t g_ModulesCompleted;
 #define TS_FAIL(...)    TRACFCOMP( g_trac_test, "!!!TS_FAIL> " __VA_ARGS__);   \
     CxxTest::doFailTest( __FILE__, __LINE__ )
 
-// These are all implemented in the cxxtest_data.C that gets put into the base
-// image.
-extern uint64_t g_TotalTests;
-extern uint64_t g_TraceCalls;
-extern uint64_t g_Warnings;
-extern uint64_t g_FailedTests;
-extern uint64_t g_ModulesStarted;
-extern uint64_t g_ModulesCompleted;
-
 // Statistics structure for passing original pointers to the runtime test suite.
 struct CxxTestStats
 {
@@ -137,6 +131,6 @@ struct CxxTestStats
     uint64_t* modulesCompleted;
 };
 
-}
+} // namespace CxxTest
 
 #endif // __cxxtest__TestSuite_h__
diff --git a/src/include/usr/cxxtest/cxxtest_data.H b/src/include/usr/cxxtest/cxxtest_data.H
new file mode 100644
index 000000000..86831c56d
--- /dev/null
+++ b/src/include/usr/cxxtest/cxxtest_data.H
@@ -0,0 +1,52 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/cxxtest/cxxtest_data.H $                      */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+/** @file   cxxtest_data.H
+ *
+ */
+
+
+#ifndef __cxxtest__cxxtest_data_h__
+#define __cxxtest__cxxtest_data_h__
+
+
+namespace CxxTest
+{
+
+enum
+{
+    CXXTEST_FILENAME_SIZE         =    50,
+    CXXTEST_FAIL_LIST_SIZE        =    10
+};
+
+struct CxxTestFailedEntry
+{
+    char failTestFile[CXXTEST_FILENAME_SIZE];
+    uint64_t failTestData;
+};
+
+} // namespace CxxTest
+
+#endif // __cxxtest__cxxtest_data_h__
\ No newline at end of file