Re-enable test cases for P9 Work

This commit re-enables the test modules that were shut off for the
initial start of of the p9 simics model. Most of the changes were
updating hardcoded values and changing the definition of a "fail"
for some of the test that were assuming certain components to be
contained in the system

Change-Id: I1860f49ea83ba1946f5181a05a4e97f10f1522f3
RTC: 129630
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22826
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

10 files changed, 280 insertions, 195 deletions

diff --git a/src/makefile b/src/makefile
index 846bdfd13..425d285a4 100644
--- a/src/makefile
+++ b/src/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2010,2015
+# Contributors Listed Below - COPYRIGHT 2010,2016
 # [+] Google Inc.
 # [+] International Business Machines Corp.
 #
@@ -158,45 +158,77 @@ EXTENDED_MODULES += $(if $(CONFIG_CONSOLE),console)
 EXTENDED_MODULES += $(if $(CONFIG_CONSOLE_OUTPUT_ERRORDISPLAY),errldisplay)
 EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmi)
 
+
+
+#***************************************
+# Working test modules
+#***************************************
 TESTCASE_MODULES += cxxtest
 TESTCASE_MODULES += testtrace
-TESTCASE_MODULES += testerrl
 TESTCASE_MODULES += testdevicefw
-TESTCASE_MODULES += testsyslib
-TESTCASE_MODULES += testscom
-TESTCASE_MODULES += testxscom
-TESTCASE_MODULES += testtargeting
-TESTCASE_MODULES += testinitservice
-TESTCASE_MODULES += testkernel
 TESTCASE_MODULES += initsvctesttask
 TESTCASE_MODULES += testcxxtest
 TESTCASE_MODULES += testpnor
-TESTCASE_MODULES += testi2c
-TESTCASE_MODULES += testfsi
 TESTCASE_MODULES += testvfs
-TESTCASE_MODULES += testhwas
-TESTCASE_MODULES += testintr
-TESTCASE_MODULES += testvpd
 TESTCASE_MODULES += testutil
-TESTCASE_MODULES += testmbox
+TESTCASE_MODULES += testscan
+TESTCASE_MODULES += testfsiscom
+TESTCASE_MODULES += testlpc
+TESTCASE_MODULES += $(if $(CONFIG_HTMGT),testhtmgt)
+TESTCASE_MODULES += testinitservice
+TESTCASE_MODULES += testfsi
+TESTCASE_MODULES += testibscom
+TESTCASE_MODULES += testxscom
+TESTCASE_MODULES += testkernel
+TESTCASE_MODULES += testtargeting
+
+#******************************************************************
+#KNOWN ISSUES (I might let these run but there is something wrong)
+#All of these are tracked by a RTC story
+#******************************************************************
+
+TESTCASE_MODULES += testerrl
+#@TODO RTC: 142612 Fix up hwas1test.H
+#TESTCASE_MODULES += testhwas
+TESTCASE_MODULES += testvpd
+TESTCASE_MODULES += testsyslib
+
+#Requires main store memory @TODO RTC: 132577
+#TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testdump)
+
+#Need to remove HostServices related code @TODO RTC:132750
+#TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testruntime)
+
+#@TODO RTC: 137561 Enable this test case when interupt story is complete
+#TESTCASE_MODULES += testintr
+
 #TODO: Need to re-enable testmdia (RTC 135217)
 #TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testmdia)
-#TESTCASE_MODULES += testprdf
-#TODO: Need to re-enable testattn (RTC 135217)
+
+#@TODO RTC: 139904 need to reenable testattn and testprdf
 #TESTCASE_MODULES += testattn
-TESTCASE_MODULES += testscan
-TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testruntime)
-TESTCASE_MODULES += testibscom
-TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testdump)
-TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testsecureboot)
-TESTCASE_MODULES += $(if $(CONFIG_TPMDD),testtrusted)
-TESTCASE_MODULES += testfsiscom
-#FIXME: RTC 129630
-#TESTCASE_MODULES += testrtloader
+#Need PRD team to look at this
+#TESTCASE_MODULES += testprdf
+
+#@TODO RTC: 123019 (p9 work in progress)
+#TESTCASE_MODULES += testi2c
+
+#@TODO RTC: 138226 (p9 work in progress)
 #TESTCASE_MODULES += testsbe
-#TESTCASE_MODULES += testlpc
-TESTCASE_MODULES += $(if $(CONFIG_HTMGT),testhtmgt)
-TESTCASE_MODULES += $(if $(CONFIG_AST2400), testsio)
+
+#@TODO RTC: 118804
+#TESTCASE_MODULES += testscom
+
+#*******************************************************
+#These modules do not work and are not tracked by any stories
+#*******************************************************
+#might need to enable isteps that turn mailboxes on
+#TESTCASE_MODULES += testmbox
+
+#TESTCASE_MODULES += testhwpf
+
+#@TODO RTC:138280 Need to enable Istep 21.1
+#TESTCASE_MODULES += testrtloader
 
 RUNTIME_OBJECTS += rt_start.o
 RUNTIME_OBJECTS += rt_main.o
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H
index b95d4d58c..4fac07cf9 100644
--- a/src/usr/errl/test/errluserdetailtest.H
+++ b/src/usr/errl/test/errluserdetailtest.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -212,58 +212,64 @@ public:
         // done - write it out
         pProcEUDA.addToLog(errl);
 
-        c_target = *pMembuf;
-        TS_TRACE( "testAttribute pMembuf %p", c_target);
-        ErrlUserDetailsTarget(c_target).addToLog(errl);
 
-        // all attributes
-        ErrlUserDetailsAttribute(c_target).addToLog(errl);
+        if(*pMembuf != NULL)
+        {
+            c_target = *pMembuf;
+            TS_TRACE( "testAttribute pMembuf %p", c_target);
+            ErrlUserDetailsTarget(c_target).addToLog(errl);
 
-        // one HUID then each attribute
-        ErrlUserDetailsAttribute pMembufEUDA(c_target,ATTR_CHIP_ID);
-        pMembufEUDA.addData(ATTR_EC);
-        pMembufEUDA.addData(ATTR_CHIP_ID);
-        pMembufEUDA.addData(ATTR_MSS_VOLT);
-        pMembufEUDA.addData(ATTR_MSS_FREQ);
+            // all attributes
+            ErrlUserDetailsAttribute(c_target).addToLog(errl);
 
-        // skipped - not there
-        pMembufEUDA.addData(ATTR_SCRATCH_UINT8_1);
+            // one HUID then each attribute
+            ErrlUserDetailsAttribute pMembufEUDA(c_target,ATTR_CHIP_ID);
+            pMembufEUDA.addData(ATTR_EC);
+            pMembufEUDA.addData(ATTR_CHIP_ID);
+            pMembufEUDA.addData(ATTR_MSS_VOLT);
+            pMembufEUDA.addData(ATTR_MSS_FREQ);
 
-        // skipped - write only
-        pMembufEUDA.addData(ATTR_DUMMY_WO);
+            // skipped - not there
+            pMembufEUDA.addData(ATTR_SCRATCH_UINT8_1);
 
-        // skipped - read only
-        pMembufEUDA.addData(ATTR_CLASS);
+            // skipped - write only
+            pMembufEUDA.addData(ATTR_DUMMY_WO);
 
-        // done - write it out
-        pMembufEUDA.addToLog(errl);
+            // skipped - read only
+            pMembufEUDA.addData(ATTR_CLASS);
 
-        c_target = *pDimm;
-        TS_TRACE( "testAttribute pDimm %p", c_target);
-        ErrlUserDetailsTarget(c_target).addToLog(errl);
+            // done - write it out
+            pMembufEUDA.addToLog(errl);
+        }
 
-        // all attributes
-        ErrlUserDetailsAttribute(c_target).addToLog(errl);
+        if(*pDimm != NULL)
+        {
+            c_target = *pDimm;
+            TS_TRACE( "testAttribute pDimm %p", c_target);
+            ErrlUserDetailsTarget(c_target).addToLog(errl);
 
-        // one HUID then each attribute
-        ErrlUserDetailsAttribute pDimmEUDA(c_target,ATTR_CHIP_ID);
-        pDimmEUDA.addData(ATTR_EC);
-        pDimmEUDA.addData(ATTR_CHIP_ID);
-        pDimmEUDA.addData(ATTR_MSS_VOLT);
-        pDimmEUDA.addData(ATTR_MSS_FREQ);
+            // all attributes
+            ErrlUserDetailsAttribute(c_target).addToLog(errl);
 
-        // skipped - not there
-        pDimmEUDA.addData(ATTR_SCRATCH_UINT8_1);
+            // one HUID then each attribute
+            ErrlUserDetailsAttribute pDimmEUDA(c_target,ATTR_CHIP_ID);
+            pDimmEUDA.addData(ATTR_EC);
+            pDimmEUDA.addData(ATTR_CHIP_ID);
+            pDimmEUDA.addData(ATTR_MSS_VOLT);
+            pDimmEUDA.addData(ATTR_MSS_FREQ);
 
-        // skipped - write only
-        pDimmEUDA.addData(ATTR_DUMMY_WO);
+            // skipped - not there
+            pDimmEUDA.addData(ATTR_SCRATCH_UINT8_1);
 
-        // skipped - read only
-        pDimmEUDA.addData(ATTR_CLASS);
+            // skipped - write only
+            pDimmEUDA.addData(ATTR_DUMMY_WO);
 
-        // done - write it out
-        pDimmEUDA.addToLog(errl);
+            // skipped - read only
+            pDimmEUDA.addData(ATTR_CLASS);
 
+            // done - write it out
+            pDimmEUDA.addToLog(errl);
+        }
 #if 0
         // extended test
         uint32_t i = 0;
@@ -283,6 +289,7 @@ public:
         TS_TRACE( "testAttribute done");
     } // testAttribute
 
+
     /**
      * @test testLogRegister - Capture a register in an error log
      */
@@ -361,11 +368,14 @@ public:
         {
             ErrlUserDetailsLogRegister eudlr(c_target);
             eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full));
-            eudlr.addData(DEVICE_MVPD_ADDRESS(3,0));
+         // Turn on MVPD Testing @TODO RTC 131121,
+         //   eudlr.addData(DEVICE_MVPD_ADDRESS(3,0));
             // error:
             eudlr.addData(DEVICE_FSI_ADDRESS(0x01028));
-            eudlr.addData(DEVICE_I2C_ADDRESS(0,0,0xAC));
-            eudlr.addData(DEVICE_EEPROM_ADDRESS(0x0,0x0));
+            //TODO RTC: 123019 I2CM changes for P9
+            //Need to uncomment this when this work is complete
+//          eudlr.addData(DEVICE_I2C_ADDRESS(0,0,0xAC));
+//          eudlr.addData(DEVICE_EEPROM_ADDRESS(0x0,0x0));
             eudlr.addToLog(errl);
         }
 
@@ -389,21 +399,21 @@ public:
         }
         ErrlUserDetailsLogRegister(c_target, &reg1_data, reg1_size,
                 DEVICE_SCOM_ADDRESS(0x000F000Full)).addToLog(errl);
-
-        uint64_t reg2_data = 0;
-        size_t reg2_size = sizeof(reg2_data);
-        errl_deviceRead = DeviceFW::deviceRead(c_target,
-                        &reg2_data, reg2_size,
-                        DEVICE_MVPD_ADDRESS(3,0));
-
-        if (errl_deviceRead != NULL)
-        {
-            TS_TRACE( "testLogRegister deviceRead return errl; deleting;");
-            delete errl_deviceRead;
-            reg2_size = 0;
-        }
-        ErrlUserDetailsLogRegister(c_target, &reg2_data, reg2_size,
-                DEVICE_MVPD_ADDRESS(3,0)).addToLog(errl);
+// Turn on MVPD Testing @TODO RTC 131121,
+//         uint64_t reg2_data = 0;
+//         size_t reg2_size = sizeof(reg2_data);
+//         errl_deviceRead = DeviceFW::deviceRead(c_target,
+//                         &reg2_data, reg2_size,
+//                         DEVICE_MVPD_ADDRESS(3,0));
+//
+//         if (errl_deviceRead != NULL)
+//         {
+//             TS_TRACE( "testLogRegister deviceRead return errl; deleting;");
+//             delete errl_deviceRead;
+//             reg2_size = 0;
+//         }
+//         ErrlUserDetailsLogRegister(c_target, &reg2_data, reg2_size,
+//                 DEVICE_MVPD_ADDRESS(3,0)).addToLog(errl);
 
         uint32_t reg3_data = 0;
         size_t reg3_size = sizeof(reg3_data);
@@ -429,54 +439,63 @@ public:
             ErrlUserDetailsLogRegister eudlr(c_target);
             eudlr.addDataBuffer(&reg1_data, reg1_size,
                     DEVICE_SCOM_ADDRESS(0x000F000Full));
-            eudlr.addDataBuffer(&reg2_data, reg2_size,
-                    DEVICE_MVPD_ADDRESS(3,0));
-            eudlr.addDataBuffer(&reg3_data, reg3_size,
-                    DEVICE_FSI_ADDRESS(0x01028));
+              // Turn on MVPD Testing @TODO RTC 131121,
+ /*           eudlr.addDataBuffer(&reg2_data, reg2_size,
+                    DEVICE_MVPD_ADDRESS(3,0));*/
+             eudlr.addDataBuffer(&reg3_data, reg3_size,
+                     DEVICE_FSI_ADDRESS(0x01028));
             eudlr.addToLog(errl);
         }
 
         // send some that aren't logged:
-        ErrlUserDetailsLogRegister(c_target,
-                DEVICE_PRESENT_ADDRESS()).addToLog(errl);
+      //TODO RTC: 123019 I2CM changes for P9
+      //Need to uncomment this when this work is complete
+//         ErrlUserDetailsLogRegister(c_target,
+//                 DEVICE_PRESENT_ADDRESS()).addToLog(errl);
         ErrlUserDetailsLogRegister(c_target,
                 DEVICE_PNOR_ADDRESS(0, 0)).addToLog(errl);
         ErrlUserDetailsLogRegister(c_target,
                 DEVICE_MBOX_ADDRESS(0)).addToLog(errl);
 
-        c_target = *pMembuf;
-        ErrlUserDetailsTarget(c_target, "Target: pMembuf").addToLog(errl);
-
-        // HUID then each register
-        {
-            ErrlUserDetailsLogRegister eudlr(c_target);
-            eudlr.addData(DEVICE_FSI_ADDRESS(0x01028));
-            eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full));
-            eudlr.addToLog(errl);
-        }
-
-        c_target = *pDimm;
-        ErrlUserDetailsTarget(c_target, "Target: pDimm").addToLog(errl);
 
-        // HUID then each register
+        if(*pMembuf != NULL)
         {
-            ErrlUserDetailsLogRegister eudlr(c_target);
-            eudlr.addData(DEVICE_SPD_ADDRESS(0));
-            eudlr.addData(DEVICE_FSI_ADDRESS(0x01028));
-            eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full));
-            eudlr.addToLog(errl);
+            c_target = *pMembuf;
+            ErrlUserDetailsTarget(c_target, "Target: pMembuf").addToLog(errl);
+
+            // HUID then each register
+            {
+                ErrlUserDetailsLogRegister eudlr(c_target);
+                eudlr.addData(DEVICE_FSI_ADDRESS(0x01028));
+                eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full));
+                eudlr.addToLog(errl);
+            }
         }
-
+        if(*pDimm != NULL)
         {
-            ErrlUserDetailsLogRegister eudlr(c_target);
-            eudlr.addData(DEVICE_FSISCOM_ADDRESS(0x01028));
-            eudlr.addData(DEVICE_XSCOM_ADDRESS(0x000F000Full));
-            eudlr.addToLog(errl);
+            c_target = *pDimm;
+            ErrlUserDetailsTarget(c_target, "Target: pDimm").addToLog(errl);
+
+            // HUID then each register
+            {
+                ErrlUserDetailsLogRegister eudlr(c_target);
+                eudlr.addData(DEVICE_SPD_ADDRESS(0));
+                eudlr.addData(DEVICE_FSI_ADDRESS(0x01028));
+                eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full));
+                eudlr.addToLog(errl);
+            }
+
+            {
+                ErrlUserDetailsLogRegister eudlr(c_target);
+                eudlr.addData(DEVICE_FSISCOM_ADDRESS(0x01028));
+                eudlr.addData(DEVICE_XSCOM_ADDRESS(0x000F000Full));
+                eudlr.addToLog(errl);
+            }
+
+            // commit the errorlog
+            errlCommit(errl, CXXTEST_COMP_ID);
+            TS_TRACE( "testLogRegister errorlog user detail data - complete");
         }
-
-        // commit the errorlog
-        errlCommit(errl, CXXTEST_COMP_ID);
-        TS_TRACE( "testLogRegister errorlog user detail data - complete");
     } // testLogRegister
 
 };
diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index ab409bc78..b3938c490 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -417,34 +417,35 @@ class FsiDDTest : public CxxTest::TestSuite
         if( l_memTargetList.empty() )
         {
             TRACFCOMP( g_trac_fsi, "FsiDDTest::test_FFDC> No Centaurs found..." );
-            TS_FAIL( "FsiDDTest::test_FFDC> No Centaurs found..." );
         }
-        TARGETING::Target* fsi_target = *(l_memTargetList.begin());
-
-        l_err =  new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
-                                         FSI::MOD_FSIDD_INVALID,
-                                         FSI::RC_BAD_REASONCODE,
-                                         TARGETING::get_huid(fsi_target),
-                                         FSI::FFDC_PRESENCE_FAIL);
-        FSI::getFsiFFDC( FSI::FFDC_PRESENCE_FAIL, l_err, fsi_target );
-        errlCommit(l_err,CXXTEST_COMP_ID);
-
-        l_err =  new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
-                                         FSI::MOD_FSIDD_INVALID,
-                                         FSI::RC_BAD_REASONCODE,
-                                         TARGETING::get_huid(fsi_target),
-                                         FSI::FFDC_READWRITE_FAIL);
-        FSI::getFsiFFDC( FSI::FFDC_READWRITE_FAIL, l_err, fsi_target );
-        errlCommit(l_err,CXXTEST_COMP_ID);
-
-        l_err =  new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
-                                         FSI::MOD_FSIDD_INVALID,
-                                         FSI::RC_BAD_REASONCODE,
-                                         TARGETING::get_huid(fsi_target),
-                                         FSI::FFDC_PIB_FAIL);
-        FSI::getFsiFFDC( FSI::FFDC_PIB_FAIL, l_err, fsi_target );
-        errlCommit(l_err,CXXTEST_COMP_ID);
-
+        else
+        {
+            TARGETING::Target* fsi_target = *(l_memTargetList.begin());
+
+            l_err =  new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+                                            FSI::MOD_FSIDD_INVALID,
+                                            FSI::RC_BAD_REASONCODE,
+                                            TARGETING::get_huid(fsi_target),
+                                            FSI::FFDC_PRESENCE_FAIL);
+            FSI::getFsiFFDC( FSI::FFDC_PRESENCE_FAIL, l_err, fsi_target );
+            errlCommit(l_err,CXXTEST_COMP_ID);
+
+            l_err =  new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+                                            FSI::MOD_FSIDD_INVALID,
+                                            FSI::RC_BAD_REASONCODE,
+                                            TARGETING::get_huid(fsi_target),
+                                            FSI::FFDC_READWRITE_FAIL);
+            FSI::getFsiFFDC( FSI::FFDC_READWRITE_FAIL, l_err, fsi_target );
+            errlCommit(l_err,CXXTEST_COMP_ID);
+
+            l_err =  new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+                                            FSI::MOD_FSIDD_INVALID,
+                                            FSI::RC_BAD_REASONCODE,
+                                            TARGETING::get_huid(fsi_target),
+                                            FSI::FFDC_PIB_FAIL);
+            FSI::getFsiFFDC( FSI::FFDC_PIB_FAIL, l_err, fsi_target );
+            errlCommit(l_err,CXXTEST_COMP_ID);
+        }
         TRACFCOMP( g_trac_fsi, "FsiDDTest::test_FFDC> Finish" );
     };
 
diff --git a/src/usr/ibscom/test/ibscomtest.H b/src/usr/ibscom/test/ibscomtest.H
index e71473dbf..55e95286e 100644
--- a/src/usr/ibscom/test/ibscomtest.H
+++ b/src/usr/ibscom/test/ibscomtest.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* [+] 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.       */
@@ -83,7 +85,7 @@ class IBscomTest: public CxxTest::TestSuite
 
         if( centaur_list.size() < 1 )
         {
-            TS_FAIL( "test_IBscom> ERROR : Unable to find a Centaur chip" );
+            TRACFCOMP(g_trac_ibscom, "test_IBscom> ERROR : Unable to find a Centaur chip" );
             return;
         }
         l_testTarget = *(centaur_list.begin());
@@ -345,7 +347,7 @@ class IBscomTest: public CxxTest::TestSuite
 
         if( centaur_list.size() < 1 )
         {
-            TS_FAIL( "test_IBscom_error> ERROR : Unable to find a Centaur chip" );
+            TRACFCOMP(g_trac_ibscom, "test_IBscom_error> ERROR : Unable to find a Centaur chip" );
             return;
         }
         l_testTarget = *(centaur_list.begin());
diff --git a/src/usr/targeting/common/test/testcommontargeting.H b/src/usr/targeting/common/test/testcommontargeting.H
index 1a61da3ea..dcae47e5f 100644
--- a/src/usr/targeting/common/test/testcommontargeting.H
+++ b/src/usr/targeting/common/test/testcommontargeting.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -816,24 +816,24 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
                     "should have matched system ");
         }
 
-        PredicateCTM l_noWild(CLASS_SYS,TYPE_SYS,MODEL_POWER8);
+        PredicateCTM l_noWild(CLASS_SYS,TYPE_SYS,MODEL_POWER9);
         if( ! l_noWild(l_pTopLevel) )
         {
-            TARG_TS_FAIL("CTM class sys, type sys, model power8 should have "
+            TARG_TS_FAIL("CTM class sys, type sys, model power9 should have "
                     "matched system ");
         }
 
-        PredicateCTM l_classWild(CLASS_NA,TYPE_SYS,MODEL_POWER8);
+        PredicateCTM l_classWild(CLASS_NA,TYPE_SYS,MODEL_POWER9);
         if( ! l_classWild(l_pTopLevel) )
         {
-            TARG_TS_FAIL("CTM class wild, type sys, model power8 should have "
+            TARG_TS_FAIL("CTM class wild, type sys, model power9 should have "
                     "matched system ");
         }
 
-        PredicateCTM l_typeWild(CLASS_SYS,TYPE_NA,MODEL_POWER8);
+        PredicateCTM l_typeWild(CLASS_SYS,TYPE_NA,MODEL_POWER9);
         if( ! l_typeWild(l_pTopLevel) )
         {
-            TARG_TS_FAIL("CTM class sys, wild, model power8 should have "
+            TARG_TS_FAIL("CTM class sys, wild, model power9 should have "
                     "matched system ");
         }
 
@@ -955,14 +955,14 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 #endif
 
         PredicateCTM l_sysType(CLASS_NA,TYPE_SYS);
-        PredicateCTM l_power8Model(CLASS_NA,TYPE_NA,MODEL_POWER8);
+        PredicateCTM l_power9Model(CLASS_NA,TYPE_NA,MODEL_POWER9);
         PredicatePostfixExpr l_expr;
         l_expr.push(&l_sysClass).push(&l_sysType).And();
-        l_expr.push(&l_power8Model).And();
+        l_expr.push(&l_power9Model).And();
 
         if(!l_expr(l_pTopLevel) )
         {
-            TARG_TS_FAIL("CTM of class sys && type sys && model power8 should "
+            TARG_TS_FAIL("CTM of class sys && type sys && model power9 should "
                     "have matched system");
         }
 
@@ -970,7 +970,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
         if(l_expr(l_pTopLevel) )
         {
-            TARG_TS_FAIL("CTM of class sys && type sys && model power8 should "
+            TARG_TS_FAIL("CTM of class sys && type sys && model power9 should "
                     "npt have matched system after negation");
         }
 
@@ -979,13 +979,13 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
         if(!l_expr(l_pTopLevel) )
         {
-            TARG_TS_FAIL("CTM of class sys && type sys && model power8 should "
+            TARG_TS_FAIL("CTM of class sys && type sys && model power9 should "
                     "have matched system after negation then || sys class");
         }
 
         PredicatePostfixExpr* l_pExpr = new PredicatePostfixExpr;
         l_pExpr->push(&l_sysClass).push(&l_sysType).And();
-        l_pExpr->push(&l_power8Model).And();
+        l_pExpr->push(&l_power9Model).And();
         delete (static_cast<PredicateBase*>(l_pExpr));
 
 #if 0
@@ -1329,13 +1329,15 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
                     "attribute access",l_type,TARGETING::TYPE_SYS);
         }
 
-        uint64_t l_xscom =
-          l_pTarget->getAttr<TARGETING::ATTR_XSCOM_BASE_ADDRESS>();
-        if(l_xscom != 0x0003FC0000000000ULL)
-        {
-            TARG_TS_FAIL("l_xscom value is 0x%016llX, not 0x%016llX as expected in direct "
-                    "attribute access",l_xscom,0x0003FC00000000ULL);
-        }
+//@TODO RTC:143749 System target returning invalid XSCOM BASE ADDRESS with
+//                 direct attribute access
+//         uint64_t l_xscom =
+//           l_pTarget->getAttr<TARGETING::ATTR_XSCOM_BASE_ADDRESS>();
+//         if(l_xscom != 0x0003FC0000000000ULL)
+//         {
+//             TARG_TS_FAIL("l_xscom value is 0x%016llX, not 0x%016llX as expected in direct "
+//                     "attribute access",l_xscom,0x0003FC00000000ULL);
+//         }
 
         TARG_TS_TRACE(INFO_MRK "Now using FAPI get macros");
 
@@ -1533,7 +1535,8 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             if(l_count <= 0)
             {
-                TARG_TS_FAIL("Did not find any Centaur chips connected to processors");
+                TARG_TS_TRACE("Did not find any Centaur \
+                  chips connected to processors");
             }
             else
             {
@@ -1826,7 +1829,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             if( l_count != total )
             {
-                TARG_TS_FAIL("Did not find any L4 targets identified "
+                TARG_TS_TRACE("Did not find any L4 targets identified "
                               "with child affinity to the processors");
             }
             else
@@ -1868,7 +1871,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             if(l_count != total )
             {
-                TARG_TS_FAIL("Did not find any L4 targets connected to MCS");
+                TARG_TS_TRACE("Did not find any L4 targets connected to MCS");
             }
             else
             {
@@ -1876,7 +1879,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
             }
         }
 
-        PredicateCTM l_nodes(CLASS_ENC,TYPE_NODE,MODEL_POWER8);
+        PredicateCTM l_nodes(CLASS_ENC,TYPE_NODE,MODEL_POWER9);
         TargetRangeFilter l_filter3(
             targetService().begin(),
             targetService().end(),
@@ -1906,7 +1909,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             if(l_count != total )
             {
-                TARG_TS_FAIL("Did not find any L4 targets "
+                TARG_TS_TRACE("Did not find any L4 targets "
                              "with child affinity to the node");
             }
             else
diff --git a/src/usr/testcore/lib/makefile b/src/usr/testcore/lib/makefile
index 1635bb7e8..43f7a6f31 100644
--- a/src/usr/testcore/lib/makefile
+++ b/src/usr/testcore/lib/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2011,2014
+# Contributors Listed Below - COPYRIGHT 2011,2016
+# [+] 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.
@@ -23,7 +25,20 @@
 ROOTPATH = ../../../..
 
 MODULE = testsyslib
-TESTS = *.H
+#TESTS = *.H
+#@TODO RTC 144346 Need fix to shared_ptr.H
+#TEST += shared_ptr.H
+TEST += fptest.H
+TEST += integral.H
+TEST += is_integral.H
+TEST += is_ptr.H
+TEST += is_same.H
+TEST += stl_functional.H
+TEST += stltest.H
+TEST += string.H
+TEST += synctest.H
+TEST += time.H
+TEST += tls.H
 
 SUBDIRS += runtime.d
 
diff --git a/src/usr/vpd/test/cvpdtest.H b/src/usr/vpd/test/cvpdtest.H
index 46975c88e..bd9f7414f 100755
--- a/src/usr/vpd/test/cvpdtest.H
+++ b/src/usr/vpd/test/cvpdtest.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -158,7 +158,8 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdRead() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd,
+                              "testCvpdRead() - No Functional Targets found!");
                     break;
                 }
 
@@ -266,7 +267,8 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdWrite() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd,
+                            "testCvpdWrite() - No Functional Targets found!");
                     break;
                 }
 
@@ -407,7 +409,7 @@ class CVPDTest: public CxxTest::TestSuite
 
             if( cmds == 0 )
             {
-                TS_FAIL("testCvpdWrite - No tests ran, something is wrong...");
+                TRACFCOMP(g_trac_vpd, "testCvpdWrite - No tests ran, something is wrong...");
             }
 
             TRACFCOMP( g_trac_vpd,
@@ -435,7 +437,7 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdInvalidRecord() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd, "testCvpdInvalidRecord() No Functional Targets found!");
                     break;
                 }
 
@@ -494,7 +496,7 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdMissingRecord() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd, "testCvpdMissingRecord() - No Functional Targets found!");
                     break;
                 }
 
@@ -549,7 +551,7 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdMissingKeyword() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd, "testCvpdMissingKeyword() - No Functional Targets found!");
                     break;
                 }
 
@@ -606,7 +608,7 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdInvalidKeyword() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd, "testCvpdInvalidKeyword() - No Functional Targets found!");
                     break;
                 }
 
@@ -665,7 +667,7 @@ class CVPDTest: public CxxTest::TestSuite
                 TARGETING::Target * theTarget = getFunctionalMembufTarget();
                 if(theTarget == NULL)
                 {
-                    TS_FAIL("testCvpdInvalidBufferSize() - No Functional Targets found!");
+                    TRACFCOMP(g_trac_vpd, "testCvpdInvalidBufferSize() - No Functional Targets found!");
                     break;
                 }
 
diff --git a/src/usr/vpd/test/makefile b/src/usr/vpd/test/makefile
index 06fe8c53d..3902c51b9 100644
--- a/src/usr/vpd/test/makefile
+++ b/src/usr/vpd/test/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2013,2016
+# [+] 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.
@@ -23,6 +25,9 @@
 ROOTPATH = ../../../..
 
 MODULE = testvpd
-TESTS = *.H
+#TESTS = *.H
 
+TESTS += spdtest.H dimmPrestest.H cvpdtest.H
+#@TODO: RTC 131121 Reenable mvpd test cases after mvpd available
+#TEST += mvpdtest.H
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/vpd/test/spdtest.H b/src/usr/vpd/test/spdtest.H
index bc7ebbd5c..f6ed956ac 100755
--- a/src/usr/vpd/test/spdtest.H
+++ b/src/usr/vpd/test/spdtest.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -244,7 +244,8 @@ class SPDTest: public CxxTest::TestSuite
 
             if( cmds == 0 )
             {
-                TS_FAIL( "testSpdRead - No tests ran, something is wrong..." );
+                TRACFCOMP(g_trac_spd,
+                          "testSpdRead - No tests ran, something is wrong..." );
             }
 
             TRACFCOMP( g_trac_spd,
@@ -442,7 +443,9 @@ class SPDTest: public CxxTest::TestSuite
 
             if( cmds == 0 )
             {
-                TS_FAIL( "testSpdWriteDQ - No tests ran, something is wrong..." );
+                TRACFCOMP( g_trac_spd,
+                           "testSpdWriteDQ - No tests ran,\
+                           something is wrong..." );
             }
 
             TRACFCOMP( g_trac_spd,
diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H
index 8cf0a9a8a..fbd6359cd 100644
--- a/src/usr/xscom/test/xscomtest.H
+++ b/src/usr/xscom/test/xscomtest.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
+/* [+] 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.       */
@@ -50,10 +52,11 @@ struct testXscomAddrData
 const testXscomAddrData g_xscomAddrTable[] =
 {
         // Write data to be ORed with read value
-        // Use PORE_GPE0_SCRATCH1_0x0006000B and PORE_GPE0_SCRATCH2_0x0006000C
+        // Use EXP0.EC.PCC1.COMMON.SPR_COMMON.SCR0 and
+        //EXP0.EC.PCC1.COMMON.SPR_COMMON.SCR1
         // Scom registers for testing
-        {0x0006000B, 0x0000040000000000},
-        {0x0006000C, 0xC000000000000000},
+        {0x21010A86, 0x0000040000000000},
+        {0x21010A87, 0xC000000000000000},
 };
 const uint32_t g_xscomAddrTableSz =
                     sizeof(g_xscomAddrTable)/sizeof(testXscomAddrData);