diff options
Diffstat (limited to 'src/include/usr')
| -rwxr-xr-x | src/include/usr/cxxtest/TestSuite.H | 22 | ||||
| -rw-r--r-- | src/include/usr/pnor/pnorif.H | 3 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/include/usr/cxxtest/TestSuite.H b/src/include/usr/cxxtest/TestSuite.H index cfeb76be0..af6b03b50 100755 --- a/src/include/usr/cxxtest/TestSuite.H +++ b/src/include/usr/cxxtest/TestSuite.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -110,6 +110,26 @@ 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 +{ + uint64_t* totalTests; + uint64_t* traceCalls; + uint64_t* warnings; + uint64_t* failedTests; + uint64_t* modulesStarted; + uint64_t* modulesCompleted; +}; + } #endif // __cxxtest__TestSuite_h__ diff --git a/src/include/usr/pnor/pnorif.H b/src/include/usr/pnor/pnorif.H index 4f3b5d930..bc3594f70 100644 --- a/src/include/usr/pnor/pnorif.H +++ b/src/include/usr/pnor/pnorif.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -44,6 +44,7 @@ enum SectionId SBE_IPL, /**< Self-Boot Engine IPL image */ WINK, /**< Sleep Winkle Reference image */ PAYLOAD, /**< HAL/OPAL */ + HB_RUNTIME, /**< Hostboot Runtime (for Sapphire) */ HB_DATA, /**< Hostboot Data */ GUARD_DATA, /**< Guard Data */ HB_ERRLOGS, /**< Hostboot Error log Repository */ |
