Add VPD support to HBRT

RTC: 79419
Change-Id: I6d00e52026084a68925691b96d7a491faaffb4ef
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7004
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 26 insertions, 3 deletions

diff --git a/src/usr/vpd/test/cvpdtest.H b/src/usr/vpd/test/cvpdtest.H
index 90f91a660..461bb6d15 100755
--- a/src/usr/vpd/test/cvpdtest.H
+++ b/src/usr/vpd/test/cvpdtest.H
@@ -247,6 +247,7 @@ class CVPDTest: public CxxTest::TestSuite
          */
         void testCvpdWrite ( void )
         {
+#ifndef __HOSTBOOT_RUNTIME
             errlHndl_t err = NULL;
             uint64_t cmds = 0x0;
             uint64_t fails = 0x0;
@@ -409,6 +410,7 @@ class CVPDTest: public CxxTest::TestSuite
             TRACFCOMP( g_trac_vpd,
                        "testCvpdWrite - %d/%d fails",
                        fails, cmds );
+#endif
         }
 
         /**
diff --git a/src/usr/vpd/test/dimmPrestest.H b/src/usr/vpd/test/dimmPrestest.H
index ff8c3e4cb..91146199b 100755
--- a/src/usr/vpd/test/dimmPrestest.H
+++ b/src/usr/vpd/test/dimmPrestest.H
@@ -55,6 +55,7 @@ class DIMMPresTest: public CxxTest::TestSuite
          */
         void testDimmPres ( void )
         {
+#ifndef __HOSTBOOT_RUNTIME
             errlHndl_t err = NULL;
             uint64_t cmds = 0x0;
             uint64_t fails = 0x0;
@@ -115,6 +116,7 @@ class DIMMPresTest: public CxxTest::TestSuite
             TRACFCOMP( g_trac_spd,
                        "testDimmPres - %d/%d fails",
                        fails, cmds );
+#endif
         }
 
 
@@ -124,6 +126,7 @@ class DIMMPresTest: public CxxTest::TestSuite
          */
         void testDimmPresInvalidSize ( void )
         {
+#ifndef __HOSTBOOT_RUNTIME
             errlHndl_t err = NULL;
             uint64_t cmds = 0x0;
             uint64_t fails = 0x0;
@@ -180,9 +183,8 @@ class DIMMPresTest: public CxxTest::TestSuite
             TRACFCOMP( g_trac_spd,
                        "testDimmPresInvalidSize() - %d/%d fails",
                        fails, cmds );
+#endif
         }
 
-
 };
-
 #endif
diff --git a/src/usr/vpd/test/mvpdtest.H b/src/usr/vpd/test/mvpdtest.H
index d40ea22d3..3ca7415ce 100755
--- a/src/usr/vpd/test/mvpdtest.H
+++ b/src/usr/vpd/test/mvpdtest.H
@@ -460,6 +460,7 @@ class MVPDTest: public CxxTest::TestSuite
                                    testData,
                                    theSize,
                                    DEVICE_MVPD_ADDRESS(MVPD::VWML,MVPD::pdI) );
+#ifndef __HOSTBOOT_RUNTIME
                 if( err )
                 {
                     fails++;
@@ -521,6 +522,19 @@ class MVPDTest: public CxxTest::TestSuite
                                 VPD_COMP_ID );
                     continue;
                 }
+#else
+                if(!err)
+                {
+                    fails++;
+                    TRACFCOMP( g_trac_vpd, ERR_MRK
+                               "testMvpdWrite() at runtime did not fail");
+                    TS_FAIL( "testMvpdWrite() - VPD write did not fail at runtime");
+                }
+                else
+                {
+                    delete err;
+                }
+#endif
                 
             } while( 0 );
 
diff --git a/src/usr/vpd/test/spdtest.H b/src/usr/vpd/test/spdtest.H
index d2c28d2e1..ce1372c2f 100755
--- a/src/usr/vpd/test/spdtest.H
+++ b/src/usr/vpd/test/spdtest.H
@@ -255,6 +255,7 @@ class SPDTest: public CxxTest::TestSuite
          */
         void testSpdWriteDQ ( void )
         {
+#ifndef __HOSTBOOT_RUNTIME
             errlHndl_t err = NULL;
             uint64_t cmds = 0x0;
             uint64_t fails = 0x0;
@@ -445,6 +446,7 @@ class SPDTest: public CxxTest::TestSuite
             TRACFCOMP( g_trac_spd,
                        "testSpdWriteDQ - %d/%d fails",
                        fails, cmds );
+#endif
         }
 
         /**
@@ -456,6 +458,7 @@ class SPDTest: public CxxTest::TestSuite
          */
         void _testSpdWriteSmall ( void )
         {
+#ifndef __HOSTBOOT_RUNTIME
             errlHndl_t err = NULL;
             uint64_t cmds = 0x0;
             uint64_t fails = 0x0;
@@ -642,6 +645,7 @@ class SPDTest: public CxxTest::TestSuite
             TRACFCOMP( g_trac_spd,
                        "testSpdWriteSmall - %d/%d fails",
                        fails, cmds );
+#endif
         }
         /**
          * @brief Test an invalid Keyword to a DIMM target.
@@ -761,6 +765,7 @@ class SPDTest: public CxxTest::TestSuite
          */
         void testSpdInvalidWrite ( void )
         {
+#ifndef __HOSTBOOT_RUNTIME
             errlHndl_t err = NULL;
             uint64_t cmds = 0x0;
             uint64_t fails = 0x0;
@@ -819,9 +824,9 @@ class SPDTest: public CxxTest::TestSuite
             TRACFCOMP( g_trac_spd,
                        "testSpdInvalidWrite - %d/%d fails",
                        fails, cmds );
+#endif
         }
 
-
         /**
          * @brief This test will test reading the Module specific keywords.
          */