diff options
Diffstat (limited to 'src/usr/vpd')
| -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 |
3 files changed, 5 insertions, 11 deletions
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; } |
