diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2016-03-21 16:47:47 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-07-26 13:10:36 -0400 |
| commit | 4414670dda8f3c4b99834a44d226ab439250f844 (patch) | |
| tree | 013e5855ba4f040048411136bb9f4f312f7cf95d /src | |
| parent | 851467dd485ccfa61c4039f347ebe490173f859c (diff) | |
| download | blackbird-hostboot-4414670dda8f3c4b99834a44d226ab439250f844.tar.gz blackbird-hostboot-4414670dda8f3c4b99834a44d226ab439250f844.zip | |
Reenable mvpd testcases after new mvpd available
Reenable mvpd testcases now that mvpd is available.
Change-Id: Ib725d6c5d7b6f5e8615b759edb1f81d4900a6487
RTC:131121
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22314
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/errl/test/errluserdetailtest.H | 37 | ||||
| -rw-r--r-- | src/usr/vpd/runtime/test/makefile | 5 | ||||
| -rw-r--r-- | src/usr/vpd/test/makefile | 5 | ||||
| -rwxr-xr-x | src/usr/vpd/test/mvpdtest.H | 6 |
4 files changed, 22 insertions, 31 deletions
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H index 4fac07cf9..c6a404d3a 100644 --- a/src/usr/errl/test/errluserdetailtest.H +++ b/src/usr/errl/test/errluserdetailtest.H @@ -368,8 +368,7 @@ public: { ErrlUserDetailsLogRegister eudlr(c_target); eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full)); - // Turn on MVPD Testing @TODO RTC 131121, - // eudlr.addData(DEVICE_MVPD_ADDRESS(3,0)); + eudlr.addData(DEVICE_MVPD_ADDRESS(3,0)); // error: eudlr.addData(DEVICE_FSI_ADDRESS(0x01028)); //TODO RTC: 123019 I2CM changes for P9 @@ -399,21 +398,20 @@ public: } ErrlUserDetailsLogRegister(c_target, ®1_data, reg1_size, DEVICE_SCOM_ADDRESS(0x000F000Full)).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, -// ®2_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, ®2_data, reg2_size, -// DEVICE_MVPD_ADDRESS(3,0)).addToLog(errl); + uint64_t reg2_data = 0; + size_t reg2_size = sizeof(reg2_data); + errl_deviceRead = DeviceFW::deviceRead(c_target, + ®2_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, ®2_data, reg2_size, + DEVICE_MVPD_ADDRESS(3,0)).addToLog(errl); uint32_t reg3_data = 0; size_t reg3_size = sizeof(reg3_data); @@ -439,9 +437,8 @@ public: ErrlUserDetailsLogRegister eudlr(c_target); eudlr.addDataBuffer(®1_data, reg1_size, DEVICE_SCOM_ADDRESS(0x000F000Full)); - // Turn on MVPD Testing @TODO RTC 131121, - /* eudlr.addDataBuffer(®2_data, reg2_size, - DEVICE_MVPD_ADDRESS(3,0));*/ + eudlr.addDataBuffer(®2_data, reg2_size, + DEVICE_MVPD_ADDRESS(3,0)); eudlr.addDataBuffer(®3_data, reg3_size, DEVICE_FSI_ADDRESS(0x01028)); eudlr.addToLog(errl); diff --git a/src/usr/vpd/runtime/test/makefile b/src/usr/vpd/runtime/test/makefile index 9a68bfaf1..fc4a0b6d6 100644 --- a/src/usr/vpd/runtime/test/makefile +++ b/src/usr/vpd/runtime/test/makefile @@ -26,9 +26,6 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../../.. MODULE = testvpd_rt -#TESTS = ../../test/*.H -TESTS = ../../test/spdtest.H ../../test/dimmPrestest.H ../../test/cvpdtest.H -#@TODO: RTC 131121 Reenable mvpd test cases after mvpd available -#TEST += mvpdtest.H +TESTS = ../../test/*.H include ${ROOTPATH}/config.mk diff --git a/src/usr/vpd/test/makefile b/src/usr/vpd/test/makefile index 85a0f9441..764f4c275 100644 --- a/src/usr/vpd/test/makefile +++ b/src/usr/vpd/test/makefile @@ -25,9 +25,6 @@ ROOTPATH = ../../../.. MODULE = testvpd -#TESTS = *.H +TESTS = *.H -TESTS += spdtest.H dimmPrestest.H cvpdtest.H dvpdtest.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/mvpdtest.H b/src/usr/vpd/test/mvpdtest.H index 1133a8968..04fac6476 100755 --- a/src/usr/vpd/test/mvpdtest.H +++ b/src/usr/vpd/test/mvpdtest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* Contributors Listed Below - COPYRIGHT 2013,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -399,7 +399,7 @@ class MVPDTest: public CxxTest::TestSuite ERR_MRK"testMvpdReadRecords() - failure" " reading record size!! rec: 0x%04x", theRecord); - TS_FAIL("testMvpdReadRecords() -Failure reading keyword size!"); + TS_FAIL("testMvpdReadRecords() -Failure reading record size!"); errlCommit( err, VPD_COMP_ID ); continue; @@ -413,7 +413,7 @@ class MVPDTest: public CxxTest::TestSuite ERR_MRK"testMvpdReadRecords() - failure" " reading record 0x%04x had size of zero!", theRecord); - TS_FAIL("testMvpdReadRecords() -Failure on keyword size of zero!"); + TS_FAIL("testMvpdReadRecords() -Failure on record size of zero!"); continue; } |
