From 719d5dd3dccbd74a71ac1a6bdb45e1626487f3e3 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Wed, 22 Feb 2017 09:28:33 -0600 Subject: gerrit35857> Fix for missing symbol Re-enable the #V tests in fapi2MvpdTestCxx.H and correct errors from running those tests. Place p9_pm_get_poundv_bucket.mk back in fapi2.mk. Change-Id: I9d4518727034caf80c23a5e8c8990e65c894051a RTC: 168957 Depends-on: I1b41fa0a175aaf9a2a6d43ce0fb7c938f203e9b4 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36855 Tested-by: Jenkins Server Reviewed-by: Christian R. Geddes Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Prachi Gupta Reviewed-by: Daniel M. Crowell --- src/usr/fapi2/fapi2.mk | 1 + src/usr/fapi2/test/fapi2MvpdTestCxx.H | 1 - src/usr/fapi2/test/fapi2Test.mk | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/usr') diff --git a/src/usr/fapi2/fapi2.mk b/src/usr/fapi2/fapi2.mk index 679214c98..d163fe858 100755 --- a/src/usr/fapi2/fapi2.mk +++ b/src/usr/fapi2/fapi2.mk @@ -125,6 +125,7 @@ include ${ROOTPATH}/src/import/tools/build/common.dir/script.rules.mk include ${ROOTPATH}/src/import/hwpf/fapi2/tools/parseErrorInfo.mk include ${ROOTPATH}/src/import/hwpf/fapi2/tools/parseAttributeInfo.mk include ${ROOTPATH}/src/import/hwpf/fapi2/tools/createIfAttrService.mk +include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket.mk include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket_attr.mk # TODO RTC:162011 after new .mk files are mirrored #include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket.mk diff --git a/src/usr/fapi2/test/fapi2MvpdTestCxx.H b/src/usr/fapi2/test/fapi2MvpdTestCxx.H index 45f0cc202..c5b5b81a1 100644 --- a/src/usr/fapi2/test/fapi2MvpdTestCxx.H +++ b/src/usr/fapi2/test/fapi2MvpdTestCxx.H @@ -321,7 +321,6 @@ public: void testMvpdGetPoundVBucket(void) { - return; //@fixme-168957:enable test after fixing symbol issue int numTests = 0; int numFails = 0; fapi2::ReturnCode l_rc; diff --git a/src/usr/fapi2/test/fapi2Test.mk b/src/usr/fapi2/test/fapi2Test.mk index 175284ec0..2ffb16e5d 100644 --- a/src/usr/fapi2/test/fapi2Test.mk +++ b/src/usr/fapi2/test/fapi2Test.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016 +# Contributors Listed Below - COPYRIGHT 2016,2017 # [+] International Business Machines Corp. # # @@ -45,6 +45,7 @@ OBJS += p9_hwtests.o OBJS += rcSupport.o OBJS += fapi2TestUtils.o OBJS += getVpdTest.o +OBJS += p9_pm_get_poundv_bucket.o TESTS += ${ROOTPATH}/src/usr/fapi2/test/*Test.H TESTS += ${ROOTPATH}/src/usr/fapi2/test/*TestCxx.H -- cgit v1.2.1