From 0cc7b8c179a5a3d349a1def66cdc1371803be00f Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Mon, 25 Sep 2017 16:22:03 -0500 Subject: Enable fapi2 runtime test cases Change-Id: I0cad695f717d686a514ee6d9ac0ca45a4441461b RTC: 179069 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46702 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- src/makefile | 4 +--- src/usr/fapi2/runtime/test/makefile | 10 ++++++++-- src/usr/fapi2/test/fapi2Test.mk | 3 +-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/makefile b/src/makefile index 51c0a7c30..c547f99ee 100644 --- a/src/makefile +++ b/src/makefile @@ -304,9 +304,7 @@ RUNTIME_TESTCASE_MODULES += $(if $(CONFIG_HBRT_PRD),testprdf_rt) RUNTIME_TESTCASE_MODULES += $(if $(CONFIG_HBRT_PRD),testattn_rt) RUNTIME_TESTCASE_MODULES += $(if $(CONFIG_BMC_IPMI),testipmi_rt) RUNTIME_TESTCASE_MODULES += testpnor_rt - -# @thi - Disable to isolate libtestfapi2.so crash -#RUNTIME_TESTCASE_MODULES += testfapi2_rt +RUNTIME_TESTCASE_MODULES += testfapi2_rt RUNTIME_TESTCASE_MODULES += testsecureboot_rt RUNTIME_TESTCASE_MODULES += testtargeting_rt diff --git a/src/usr/fapi2/runtime/test/makefile b/src/usr/fapi2/runtime/test/makefile index 8fe452e7b..88cb33044 100644 --- a/src/usr/fapi2/runtime/test/makefile +++ b/src/usr/fapi2/runtime/test/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -32,7 +32,13 @@ MODULE = testfapi2_rt include ../../test/fapi2Test.mk +$(info TESTS before is ${TESTS}) +TMPVAR1 := ${TESTS} +#RTC: 181003 need to determine why fapi2HwpErrorBufferTest.H is getting data storage exception in RT +TESTS = $(filter-out ${ROOTPATH}/src/usr/fapi2/test/getVpdTest.H ${ROOTPATH}/src/usr/fapi2/test/fapi2GetVpdTest.H ${ROOTPATH}/src/usr/fapi2/test/fapi2HwpErrorBufferTest.H , ${TMPVAR1}) +TMPVAR2 := ${OBJS} +OBJS = $(filter-out getVpdTest.o, ${TMPVAR2}) include ${ROOTPATH}/config.mk - +$(info TESTS after is ${TESTS}) VPATH += ../../test/ diff --git a/src/usr/fapi2/test/fapi2Test.mk b/src/usr/fapi2/test/fapi2Test.mk index 3a4e4c7e4..e87f1a3ab 100644 --- a/src/usr/fapi2/test/fapi2Test.mk +++ b/src/usr/fapi2/test/fapi2Test.mk @@ -48,7 +48,6 @@ 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 +TESTS += ${shell find ${ROOTPATH}/src/usr/fapi2/test/ | sort | grep -e "Test.H" -e "TestCxx.H" | xargs} VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/pm/ -- cgit v1.2.1